Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
Date: Wed, 28 Mar 2018 19:33:26
Message-Id: 1522265596.f2e7d9e2c6ad55e21da2871f00af364662da4061.tamiko@gentoo
1 commit: f2e7d9e2c6ad55e21da2871f00af364662da4061
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 28 19:29:44 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 28 19:33:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e7d9e2
7
8 app-emulation/libvirt: drop 4.0.0
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 app-emulation/libvirt/Manifest | 1 -
13 app-emulation/libvirt/libvirt-4.0.0.ebuild | 386 -----------------------------
14 2 files changed, 387 deletions(-)
15
16 diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
17 index e99e3e4fadd..91e8bee76fc 100644
18 --- a/app-emulation/libvirt/Manifest
19 +++ b/app-emulation/libvirt/Manifest
20 @@ -1,2 +1 @@
21 -DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b SHA512 c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1
22 DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
23
24 diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild b/app-emulation/libvirt/libvirt-4.0.0.ebuild
25 deleted file mode 100644
26 index 954c95e4157..00000000000
27 --- a/app-emulation/libvirt/libvirt-4.0.0.ebuild
28 +++ /dev/null
29 @@ -1,386 +0,0 @@
30 -# Copyright 1999-2018 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=6
34 -
35 -inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1
36 -
37 -if [[ ${PV} = *9999* ]]; then
38 - inherit git-r3
39 - EGIT_REPO_URI="git://libvirt.org/libvirt.git"
40 - SRC_URI=""
41 - KEYWORDS=""
42 - SLOT="0"
43 -else
44 - # Versions with 4 numbers are stable updates:
45 - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
46 - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
47 - else
48 - SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
49 - fi
50 - KEYWORDS="amd64 ~arm64 x86"
51 - SLOT="0/${PV}"
52 -fi
53 -
54 -DESCRIPTION="C toolkit to manipulate virtual machines"
55 -HOMEPAGE="http://www.libvirt.org/"
56 -LICENSE="LGPL-2.1"
57 -IUSE="
58 - apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
59 - libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
60 - +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
61 - wireshark-plugins xen zeroconf zfs
62 -"
63 -
64 -REQUIRED_USE="
65 - firewalld? ( virt-network )
66 - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
67 - lxc? ( caps libvirtd )
68 - openvz? ( libvirtd )
69 - policykit? ( dbus )
70 - qemu? ( libvirtd )
71 - uml? ( libvirtd )
72 - vepa? ( macvtap )
73 - virt-network? ( libvirtd )
74 - virtualbox? ( libvirtd )
75 - xen? ( libvirtd )"
76 -
77 -# gettext.sh command is used by the libvirt command wrappers, and it's
78 -# non-optional, so put it into RDEPEND.
79 -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
80 -# package will use 3 by default. Since we don't have slot pinning in an API,
81 -# we must go with the most recent
82 -RDEPEND="
83 - app-misc/scrub
84 - dev-libs/libgcrypt:0
85 - dev-libs/libnl:3
86 - >=dev-libs/libxml2-2.7.6
87 - || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
88 - >=net-libs/gnutls-1.0.25:0=
89 - net-libs/libssh2
90 - net-libs/libtirpc
91 - net-libs/rpcsvc-proto
92 - >=net-misc/curl-7.18.0
93 - sys-apps/dmidecode
94 - >=sys-apps/util-linux-2.17
95 - sys-devel/gettext
96 - sys-libs/ncurses:0=
97 - sys-libs/readline:=
98 - apparmor? ( sys-libs/libapparmor )
99 - audit? ( sys-process/audit )
100 - caps? ( sys-libs/libcap-ng )
101 - dbus? ( sys-apps/dbus )
102 - firewalld? ( net-firewall/firewalld )
103 - fuse? ( >=sys-fs/fuse-2.8.6:= )
104 - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
105 - iscsi? ( sys-block/open-iscsi )
106 - libssh? ( net-libs/libssh )
107 - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
108 - nfs? ( net-fs/nfs-utils )
109 - numa? (
110 - >sys-process/numactl-2.0.2
111 - sys-process/numad
112 - )
113 - parted? (
114 - >=sys-block/parted-1.8[device-mapper]
115 - sys-fs/lvm2[-device-mapper-only(-)]
116 - )
117 - pcap? ( >=net-libs/libpcap-1.0.0 )
118 - policykit? ( >=sys-auth/polkit-0.9 )
119 - qemu? (
120 - >=app-emulation/qemu-0.13.0
121 - dev-libs/yajl
122 - )
123 - rbd? ( sys-cluster/ceph )
124 - sasl? ( dev-libs/cyrus-sasl )
125 - selinux? ( >=sys-libs/libselinux-2.0.85 )
126 - virt-network? (
127 - net-dns/dnsmasq[script]
128 - net-firewall/ebtables
129 - >=net-firewall/iptables-1.4.10[ipv6]
130 - net-misc/radvd
131 - sys-apps/iproute2[-minimal]
132 - )
133 - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
134 - wireshark-plugins? ( net-analyzer/wireshark:= )
135 - xen? (
136 - app-emulation/xen
137 - app-emulation/xen-tools:=
138 - )
139 - udev? (
140 - virtual/udev
141 - >=x11-libs/libpciaccess-0.10.9
142 - )
143 - zeroconf? ( >=net-dns/avahi-0.6[dbus] )
144 - zfs? ( sys-fs/zfs )"
145 -
146 -DEPEND="${RDEPEND}
147 - app-text/xhtml1
148 - dev-lang/perl
149 - dev-libs/libxslt
150 - dev-perl/XML-XPath
151 - virtual/pkgconfig"
152 -
153 -PATCHES=(
154 - "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
155 - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
156 - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
157 - "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
158 - "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
159 - "${FILESDIR}"/${PN}-4.0.0-bash_completion_bugfixes.patch # bug #644632
160 -)
161 -
162 -pkg_setup() {
163 - if use qemu; then
164 - enewgroup qemu 77
165 - enewuser qemu 77 -1 -1 "qemu,kvm"
166 - fi
167 -
168 - use policykit && enewgroup libvirt
169 -
170 - # Check kernel configuration:
171 - CONFIG_CHECK=""
172 - use fuse && CONFIG_CHECK+="
173 - ~FUSE_FS"
174 -
175 - use lvm && CONFIG_CHECK+="
176 - ~BLK_DEV_DM
177 - ~DM_MULTIPATH
178 - ~DM_SNAPSHOT"
179 -
180 - use lxc && CONFIG_CHECK+="
181 - ~BLK_CGROUP
182 - ~CGROUP_CPUACCT
183 - ~CGROUP_DEVICE
184 - ~CGROUP_FREEZER
185 - ~CGROUP_NET_PRIO
186 - ~CGROUP_PERF
187 - ~CGROUPS
188 - ~CGROUP_SCHED
189 - ~CPUSETS
190 - ~IPC_NS
191 - ~MACVLAN
192 - ~NAMESPACES
193 - ~NET_CLS_CGROUP
194 - ~NET_NS
195 - ~PID_NS
196 - ~POSIX_MQUEUE
197 - ~SECURITYFS
198 - ~USER_NS
199 - ~UTS_NS
200 - ~VETH
201 - ~!GRKERNSEC_CHROOT_MOUNT
202 - ~!GRKERNSEC_CHROOT_DOUBLE
203 - ~!GRKERNSEC_CHROOT_PIVOT
204 - ~!GRKERNSEC_CHROOT_CHMOD
205 - ~!GRKERNSEC_CHROOT_CAPS"
206 -
207 - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
208 - ~DEVPTS_MULTIPLE_INSTANCES"
209 -
210 - use macvtap && CONFIG_CHECK+="
211 - ~MACVTAP"
212 -
213 - use virt-network && CONFIG_CHECK+="
214 - ~BRIDGE_EBT_MARK_T
215 - ~BRIDGE_NF_EBTABLES
216 - ~NETFILTER_ADVANCED
217 - ~NETFILTER_XT_CONNMARK
218 - ~NETFILTER_XT_MARK
219 - ~NETFILTER_XT_TARGET_CHECKSUM"
220 - # Bandwidth Limiting Support
221 - use virt-network && CONFIG_CHECK+="
222 - ~BRIDGE_EBT_T_NAT
223 - ~NET_ACT_POLICE
224 - ~NET_CLS_FW
225 - ~NET_CLS_U32
226 - ~NET_SCH_HTB
227 - ~NET_SCH_INGRESS
228 - ~NET_SCH_SFQ"
229 -
230 - # Handle specific kernel versions for different features
231 - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
232 - if kernel_is ge 3 6; then
233 - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
234 - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
235 - fi
236 -
237 - ERROR_USER_NS="Optional depending on LXC configuration."
238 -
239 - if [[ -n ${CONFIG_CHECK} ]]; then
240 - linux-info_pkg_setup
241 - fi
242 -}
243 -
244 -src_prepare() {
245 - touch "${S}/.mailmap"
246 -
247 - default
248 -
249 - if [[ ${PV} = *9999* ]]; then
250 - # git checkouts require bootstrapping to create the configure script.
251 - # Additionally the submodules must be cloned to the right locations
252 - # bug #377279
253 - ./bootstrap || die "bootstrap failed"
254 - (
255 - git submodule status | sed 's/^[ +-]//;s/ .*//'
256 - git hash-object bootstrap.conf
257 - ) >.git-module-status
258 - fi
259 -
260 - # Tweak the init script:
261 - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
262 - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
263 - -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
264 - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
265 - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
266 - -i "${S}/libvirtd.init" || die "sed failed"
267 -
268 - eautoreconf
269 -}
270 -
271 -src_configure() {
272 - local myeconfargs=(
273 - $(use_with apparmor)
274 - $(use_with apparmor apparmor-profiles)
275 - $(use_with audit)
276 - $(use_with caps capng)
277 - $(use_with dbus)
278 - $(use_with firewalld)
279 - $(use_with fuse)
280 - $(use_with glusterfs)
281 - $(use_with glusterfs storage-gluster)
282 - $(use_with iscsi storage-iscsi)
283 - $(use_with libvirtd)
284 - $(use_with libssh)
285 - $(use_with lvm storage-lvm)
286 - $(use_with lvm storage-mpath)
287 - $(use_with lxc)
288 - $(use_with macvtap)
289 - $(use_enable nls)
290 - $(use_with numa numactl)
291 - $(use_with numa numad)
292 - $(use_with openvz)
293 - $(use_with parted storage-disk)
294 - $(use_with pcap libpcap)
295 - $(use_with phyp)
296 - $(use_with policykit polkit)
297 - $(use_with qemu)
298 - $(use_with qemu yajl)
299 - $(use_with rbd storage-rbd)
300 - $(use_with sasl)
301 - $(use_with selinux)
302 - $(use_with udev)
303 - $(use_with uml)
304 - $(use_with vepa virtualport)
305 - $(use_with virt-network network)
306 - $(use_with wireshark-plugins wireshark-dissector)
307 - $(use_with xen)
308 - $(use_with xen xen-inotify)
309 - $(use_with xen libxl)
310 - $(use_with zeroconf avahi)
311 - $(use_with zfs storage-zfs)
312 -
313 - --without-hal
314 - --without-netcf
315 - --without-sanlock
316 - --without-xenapi
317 -
318 - --with-esx
319 - --with-init-script=systemd
320 - --with-qemu-group=$(usex caps qemu root)
321 - --with-qemu-user=$(usex caps qemu root)
322 - --with-remote
323 - --with-storage-fs
324 - --with-vmware
325 -
326 - --disable-static
327 - --disable-werror
328 -
329 - --with-html-subdir=${PF}/html
330 - --localstatedir=/var
331 - )
332 -
333 - if use virtualbox && has_version app-emulation/virtualbox-ose; then
334 - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
335 - else
336 - myeconfargs+=( $(use_with virtualbox vbox) )
337 - fi
338 -
339 - econf "${myeconfargs[@]}"
340 -
341 - if [[ ${PV} = *9999* ]]; then
342 - # Restore gnulib's config.sub and config.guess
343 - # bug #377279
344 - (cd .gnulib && git reset --hard > /dev/null)
345 - fi
346 -}
347 -
348 -src_test() {
349 - cd "${BUILD_DIR}"
350 -
351 - # remove problematic tests, bug #591416, bug #591418
352 - sed -i -e 's#commandtest$(EXEEXT) # #' \
353 - -e 's#virfirewalltest$(EXEEXT) # #' \
354 - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
355 - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
356 - tests/Makefile
357 -
358 - export VIR_TEST_DEBUG=1
359 - HOME="${T}" emake check || die "tests failed"
360 -}
361 -
362 -src_install() {
363 - emake DESTDIR="${D}" \
364 - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
365 -
366 - find "${D}" -name '*.la' -delete || die
367 -
368 - # Remove bogus, empty directories. They are either not used, or
369 - # libvirtd is able to create them on demand
370 - rm -rf "${D}"/etc/sysconfig
371 - rm -rf "${D}"/var/cache
372 - rm -rf "${D}"/var/run
373 - rm -rf "${D}"/var/log
374 -
375 - use libvirtd || return 0
376 - # From here, only libvirtd-related instructions, be warned!
377 -
378 - systemd_install_serviced \
379 - "${FILESDIR}"/libvirtd.service.conf libvirtd.service
380 -
381 - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
382 -
383 - newinitd "${S}/libvirtd.init" libvirtd || die
384 - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
385 - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
386 - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
387 -
388 - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
389 - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
390 -
391 - newbashcomp "${S}/tools/bash-completion/vsh" vsh
392 - bashcomp_alias vsh virsh virt-admin
393 -
394 - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
395 - DISABLE_AUTOFORMATTING=true
396 - readme.gentoo_create_doc
397 -}
398 -
399 -pkg_preinst() {
400 - # we only ever want to generate this once
401 - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
402 - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
403 - fi
404 -}
405 -
406 -pkg_postinst() {
407 - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
408 - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
409 - fi
410 -
411 - use libvirtd || return 0
412 - # From here, only libvirtd-related instructions, be warned!
413 -
414 - readme.gentoo_print_elog
415 -}