Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/libvirt: libvirt-0.9.11.3.ebuild ChangeLog libvirt-0.9.11.2.ebuild
Date: Mon, 30 Apr 2012 20:33:06
Message-Id: 20120430203255.22E082004B@flycatcher.gentoo.org
1 cardoe 12/04/30 20:32:55
2
3 Modified: ChangeLog
4 Added: libvirt-0.9.11.3.ebuild
5 Removed: libvirt-0.9.11.2.ebuild
6 Log:
7 Stable version bump
8
9 (Portage version: 2.1.10.57/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.173 app-emulation/libvirt/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.173&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.173&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.172&r2=1.173
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v
21 retrieving revision 1.172
22 retrieving revision 1.173
23 diff -u -r1.172 -r1.173
24 --- ChangeLog 30 Apr 2012 18:43:49 -0000 1.172
25 +++ ChangeLog 30 Apr 2012 20:32:55 -0000 1.173
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-emulation/libvirt
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.172 2012/04/30 18:43:49 cardoe Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.173 2012/04/30 20:32:55 cardoe Exp $
31 +
32 +*libvirt-0.9.11.3 (30 Apr 2012)
33 +
34 + 30 Apr 2012; Doug Goldstein <cardoe@g.o> -libvirt-0.9.11.2.ebuild,
35 + +libvirt-0.9.11.3.ebuild:
36 + Stable version bump
37
38 *libvirt-0.9.11.2 (30 Apr 2012)
39
40
41
42
43 1.1 app-emulation/libvirt/libvirt-0.9.11.3.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.3.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.3.ebuild?rev=1.1&content-type=text/plain
47
48 Index: libvirt-0.9.11.3.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.3.ebuild,v 1.1 2012/04/30 20:32:55 cardoe Exp $
53
54 EAPI=4
55
56 #BACKPORTS=1
57 #AUTOTOOLIZE=yes
58
59 MY_P="${P/_rc/-rc}"
60
61 if [[ ${PV} = *9999* ]]; then
62 EGIT_REPO_URI="git://libvirt.org/libvirt.git"
63 GIT_ECLASS="git-2"
64 AUTOTOOLIZE=yes
65 fi
66
67 PYTHON_DEPEND="python? 2:2.5"
68 #RESTRICT_PYTHON_ABIS="3.*"
69 #SUPPORT_PYTHON_ABIS="1"
70
71 inherit eutils python ${AUTOTOOLIZE+autotools} ${GIT_ECLASS}
72
73 if [[ ${PV} = *9999* ]]; then
74 SRC_URI=""
75 KEYWORDS=""
76 else
77 SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
78 ftp://libvirt.org/libvirt/${MY_P}.tar.gz
79 ${BACKPORTS:+
80 http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
81 KEYWORDS="~amd64 ~x86"
82 fi
83 S="${WORKDIR}/${P%_rc*}"
84
85 DESCRIPTION="C toolkit to manipulate virtual machines"
86 HOMEPAGE="http://www.libvirt.org/"
87 LICENSE="LGPL-2.1"
88 SLOT="0"
89 IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap nfs \
90 nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
91 uml virtualbox virt-network xen elibc_glibc"
92 # IUSE=one : bug #293416 & bug #299011
93 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
94 lxc? ( libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
95 virtualbox? ( libvirtd ) xen? ( libvirtd )"
96
97 # gettext.sh command is used by the libvirt command wrappers, and it's
98 # non-optional, so put it into RDEPEND.
99 RDEPEND="sys-libs/readline
100 sys-libs/ncurses
101 >=net-misc/curl-7.18.0
102 >=dev-libs/libxml2-2.7.6
103 >=dev-libs/libnl-1.1:1.1
104 >=net-libs/gnutls-1.0.25
105 sys-apps/dmidecode
106 >=sys-apps/util-linux-2.17
107 sys-devel/gettext
108 >=net-analyzer/netcat6-1.0-r2
109 app-misc/scrub
110 avahi? ( >=net-dns/avahi-0.6[dbus] )
111 caps? ( sys-libs/libcap-ng )
112 iscsi? ( sys-block/open-iscsi )
113 libvirtd? ( net-misc/bridge-utils )
114 lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
115 nfs? ( net-fs/nfs-utils )
116 numa? ( >sys-process/numactl-2.0.2 )
117 openvz? ( sys-kernel/openvz-sources )
118 parted? (
119 >=sys-block/parted-1.8[device-mapper]
120 sys-fs/lvm2
121 )
122 pcap? ( >=net-libs/libpcap-1.0.0 )
123 phyp? ( net-libs/libssh2 )
124 policykit? ( >=sys-auth/polkit-0.9 )
125 qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
126 dev-libs/yajl )
127 sasl? ( dev-libs/cyrus-sasl )
128 selinux? ( >=sys-libs/libselinux-2.0.85 )
129 virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
130 xen? ( app-emulation/xen-tools app-emulation/xen )
131 udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
132 virt-network? ( net-dns/dnsmasq
133 >=net-firewall/iptables-1.4.10
134 net-firewall/ebtables
135 sys-apps/iproute2[-minimal] )
136 elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
137 # one? ( dev-libs/xmlrpc-c )
138 DEPEND="${RDEPEND}
139 dev-util/pkgconfig
140 app-text/xhtml1"
141
142 pkg_setup() {
143 use python && python_set_active_version 2
144 python_pkg_setup
145 }
146
147 src_prepare() {
148 [[ -n ${BACKPORTS} ]] && \
149 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
150 epatch
151
152 if [[ ${PV} = *9999* ]]; then
153 # git checkouts require bootstrapping to create the configure script.
154 # Additionally the submodules must be cloned to the right locations
155 # bug #377279
156 ./bootstrap || die "bootstrap failed"
157 (
158 git submodule status | sed 's/^[ +-]//;s/ .*//'
159 git hash-object bootstrap.conf
160 ) >.git-module-status
161 fi
162
163 [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
164 }
165
166 src_configure() {
167 local myconf=""
168
169 myconf="${myconf} $(use_enable debug)"
170
171 ## enable/disable daemon, otherwise client only utils
172 myconf="${myconf} $(use_with libvirtd)"
173
174 ## enable/disable the daemon using avahi to find VMs
175 myconf="${myconf} $(use_with avahi)"
176
177 ## hypervisors on the local host
178 myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
179 # leave it automagic as it depends on the version of xen used.
180 use xen || myconf+=" --without-libxl"
181
182 myconf="${myconf} $(use_with openvz)"
183 myconf="${myconf} $(use_with lxc)"
184 if use virtualbox && has_version app-emulation/virtualbox-ose; then
185 myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
186 else
187 myconf="${myconf} $(use_with virtualbox vbox)"
188 fi
189 myconf="${myconf} $(use_with uml)"
190 myconf="${myconf} $(use_with qemu)"
191 myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
192 # doesn't belong with hypervisors but links to libvirtd for some reason
193 #myconf="${myconf} $(use_with one)"
194
195 ## hypervisor protocols
196 myconf="${myconf} $(use_with phyp)"
197 myconf="${myconf} --with-esx"
198
199 ## additional host drivers
200 myconf="${myconf} $(use_with virt-network network)"
201 myconf="${myconf} --with-storage-fs"
202 myconf="${myconf} $(use_with lvm storage-lvm)"
203 myconf="${myconf} $(use_with iscsi storage-iscsi)"
204 myconf="${myconf} $(use_with parted storage-disk)"
205 myconf="${myconf} $(use_with lvm storage-mpath)"
206 myconf="${myconf} $(use_with numa numactl)"
207 myconf="${myconf} $(use_with selinux)"
208
209 # udev for device support details
210 myconf="${myconf} $(use_with udev)"
211
212 # linux capability support so we don't need privileged accounts
213 myconf="${myconf} $(use_with caps capng)"
214
215 ## auth stuff
216 myconf="${myconf} $(use_with policykit polkit)"
217 myconf="${myconf} $(use_with sasl)"
218
219 # network bits
220 myconf="${myconf} $(use_with macvtap)"
221 myconf="${myconf} $(use_with pcap libpcap)"
222
223 ## other
224 myconf="${myconf} $(use_enable nls)"
225 myconf="${myconf} $(use_with python)"
226
227 ## stuff we don't yet support
228 myconf="${myconf} --without-netcf --without-audit"
229
230 # we use udev over hal
231 myconf="${myconf} --without-hal"
232
233 # locking support
234 myconf="${myconf} --without-sanlock"
235
236 # this is a nasty trick to work around the problem in bug
237 # #275073. The reason why we don't solve this properly is that
238 # it'll require us to rebuild autotools (and we don't really want
239 # to do that right now). The proper solution has been sent
240 # upstream and should hopefully land in 0.7.7, in the mean time,
241 # mime the same functionality with this.
242 case ${CHOST} in
243 *cygwin* | *mingw* )
244 ;;
245 *)
246 ac_cv_prog_WINDRES=no
247 ;;
248 esac
249
250 econf \
251 ${myconf} \
252 --disable-static \
253 --docdir=/usr/share/doc/${PF} \
254 --with-remote \
255 --localstatedir=/var
256
257 if [[ ${PV} = *9999* ]]; then
258 # Restore gnulib's config.sub and config.guess
259 # bug #377279
260 (cd .gnulib && git reset --hard > /dev/null)
261 fi
262 }
263
264 src_test() {
265 # Explicitly allow parallel build of tests
266 HOME="${T}" emake check || die "tests failed"
267 }
268
269 src_install() {
270 emake install \
271 DESTDIR="${D}" \
272 HTML_DIR=/usr/share/doc/${PF}/html \
273 DOCS_DIR=/usr/share/doc/${PF}/python \
274 EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
275 || die "emake install failed"
276
277 find "${D}" -name '*.la' -delete || die
278
279 use libvirtd || return 0
280 # From here, only libvirtd-related instructions, be warned!
281
282 newinitd "${FILESDIR}/libvirtd.init-r8" libvirtd || die
283 newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
284
285 keepdir /var/lib/libvirt/images
286 }
287
288 pkg_preinst() {
289 # we only ever want to generate this once
290 if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
291 rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
292 fi
293
294 # We really don't want to use or support old PolicyKit cause it
295 # screws with the new polkit integration
296 if has_version sys-auth/policykit; then
297 rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
298 fi
299
300 # Only sysctl files ending in .conf work
301 mv "${D}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
302 }
303
304 pkg_postinst() {
305 use python && python_mod_optimize libvirt.py
306
307 elog
308 if use policykit && has_version sys-auth/policykit; then
309 elog "You must have run the following at least once:"
310 elog
311 elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
312 elog
313 elog "to grant USERNAME access to libvirt when using USE=policykit"
314 else
315 elog "To allow normal users to connect to libvirtd you must change the"
316 elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
317 fi
318
319 use libvirtd || return 0
320 # From here, only libvirtd-related instructions, be warned!
321
322 elog
323 elog "For the basic networking support (bridged and routed networks)"
324 elog "you don't need any extra software. For more complex network modes"
325 elog "including but not limited to NATed network, you can enable the"
326 elog "'virt-network' USE flag."
327 elog
328 if has_version net-dns/dnsmasq; then
329 ewarn "If you have a DNS server setup on your machine, you will have"
330 ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
331 ewarn " bind-interfaces"
332 ewarn " interface or except-interface"
333 ewarn
334 ewarn "Otherwise you might have issues with your existing DNS server."
335 fi
336 }
337
338 pkg_postrm() {
339 use python && python_mod_cleanup libvirt.py
340 }