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: Mon, 01 Jul 2019 15:07:09
Message-Id: 1561992651.8bd3396181c300fffb31a875e4590f6b920098d8.tamiko@gentoo
1 commit: 8bd3396181c300fffb31a875e4590f6b920098d8
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 1 14:50:51 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 1 14:50:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd33961
7
8 app-emulation/libvirt: drop old
9
10 Package-Manager: Portage-2.3.68, Repoman-2.3.16
11 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
12
13 app-emulation/libvirt/Manifest | 1 -
14 app-emulation/libvirt/libvirt-4.9.0.ebuild | 379 -----------------------------
15 app-emulation/libvirt/metadata.xml | 3 -
16 3 files changed, 383 deletions(-)
17
18 diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
19 index 2e1cb5c5854..095961297b2 100644
20 --- a/app-emulation/libvirt/Manifest
21 +++ b/app-emulation/libvirt/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
24 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
25 DIST libvirt-5.4.0.tar.xz 12346896 BLAKE2B 28efa8ddc1b3262cf195bb114d3fad8307e7b4b4578a8dca05c03e36c85c7bffb4a4f6c73f89d156fc5b046f8ff7f27950dc5cadfd944e9f3c1b854ad03f328c SHA512 03fa932d041d147cab79eab200bb33f8db72579be72ec7cbff3305f4a8d574835a80f1b99936eddf67f83d21cc5567f45c86e555209de6cd702f43f91197cfd0
26
27 diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
28 deleted file mode 100644
29 index 1e923491c2b..00000000000
30 --- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
31 +++ /dev/null
32 @@ -1,379 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python3_{5,6,7} )
39 -
40 -inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
41 -
42 -if [[ ${PV} = *9999* ]]; then
43 - inherit git-r3
44 - EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
45 - SRC_URI=""
46 - KEYWORDS="amd64 x86"
47 - SLOT="0"
48 -else
49 - SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
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 iscsi-direct
59 - +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
60 - policykit +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/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 - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
107 - libssh? ( net-libs/libssh )
108 - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
109 - nfs? ( net-fs/nfs-utils )
110 - numa? (
111 - >sys-process/numactl-2.0.2
112 - sys-process/numad
113 - )
114 - parted? (
115 - >=sys-block/parted-1.8[device-mapper]
116 - sys-fs/lvm2[-device-mapper-only(-)]
117 - )
118 - pcap? ( >=net-libs/libpcap-1.0.0 )
119 - policykit? ( >=sys-auth/polkit-0.9 )
120 - qemu? (
121 - >=app-emulation/qemu-1.5.0
122 - dev-libs/yajl
123 - )
124 - rbd? ( sys-cluster/ceph )
125 - sasl? ( dev-libs/cyrus-sasl )
126 - selinux? ( >=sys-libs/libselinux-2.0.85 )
127 - virt-network? (
128 - net-dns/dnsmasq[script]
129 - net-firewall/ebtables
130 - >=net-firewall/iptables-1.4.10[ipv6]
131 - net-misc/radvd
132 - sys-apps/iproute2[-minimal]
133 - )
134 - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
135 - wireshark-plugins? ( net-analyzer/wireshark:= )
136 - xen? (
137 - >=app-emulation/xen-4.6.0
138 - app-emulation/xen-tools:=
139 - )
140 - udev? (
141 - virtual/udev
142 - >=x11-libs/libpciaccess-0.10.9
143 - )
144 - zeroconf? ( >=net-dns/avahi-0.6[dbus] )
145 - zfs? ( sys-fs/zfs )"
146 -
147 -DEPEND="${RDEPEND}
148 - ${PYTHON_DEPS}
149 - app-text/xhtml1
150 - dev-lang/perl
151 - dev-libs/libxslt
152 - dev-perl/XML-XPath
153 - virtual/pkgconfig"
154 -
155 -PATCHES=(
156 - "${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
157 - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
158 - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
159 -)
160 -
161 -pkg_setup() {
162 - if use qemu; then
163 - enewgroup qemu 77
164 - enewuser qemu 77 -1 -1 "qemu,kvm"
165 - fi
166 -
167 - use policykit && enewgroup libvirt
168 -
169 - # Check kernel configuration:
170 - CONFIG_CHECK=""
171 - use fuse && CONFIG_CHECK+="
172 - ~FUSE_FS"
173 -
174 - use lvm && CONFIG_CHECK+="
175 - ~BLK_DEV_DM
176 - ~DM_MULTIPATH
177 - ~DM_SNAPSHOT"
178 -
179 - use lxc && CONFIG_CHECK+="
180 - ~BLK_CGROUP
181 - ~CGROUP_CPUACCT
182 - ~CGROUP_DEVICE
183 - ~CGROUP_FREEZER
184 - ~CGROUP_NET_PRIO
185 - ~CGROUP_PERF
186 - ~CGROUPS
187 - ~CGROUP_SCHED
188 - ~CPUSETS
189 - ~IPC_NS
190 - ~MACVLAN
191 - ~NAMESPACES
192 - ~NET_CLS_CGROUP
193 - ~NET_NS
194 - ~PID_NS
195 - ~POSIX_MQUEUE
196 - ~SECURITYFS
197 - ~USER_NS
198 - ~UTS_NS
199 - ~VETH
200 - ~!GRKERNSEC_CHROOT_MOUNT
201 - ~!GRKERNSEC_CHROOT_DOUBLE
202 - ~!GRKERNSEC_CHROOT_PIVOT
203 - ~!GRKERNSEC_CHROOT_CHMOD
204 - ~!GRKERNSEC_CHROOT_CAPS"
205 -
206 - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
207 - ~DEVPTS_MULTIPLE_INSTANCES"
208 -
209 - use macvtap && CONFIG_CHECK+="
210 - ~MACVTAP"
211 -
212 - use virt-network && CONFIG_CHECK+="
213 - ~BRIDGE_EBT_MARK_T
214 - ~BRIDGE_NF_EBTABLES
215 - ~NETFILTER_ADVANCED
216 - ~NETFILTER_XT_CONNMARK
217 - ~NETFILTER_XT_MARK
218 - ~NETFILTER_XT_TARGET_CHECKSUM"
219 - # Bandwidth Limiting Support
220 - use virt-network && CONFIG_CHECK+="
221 - ~BRIDGE_EBT_T_NAT
222 - ~IP_NF_TARGET_REJECT
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 iscsi-direct storage-iscsi-direct)
284 - $(use_with libvirtd)
285 - $(use_with libssh)
286 - $(use_with lvm storage-lvm)
287 - $(use_with lvm storage-mpath)
288 - $(use_with lxc)
289 - $(use_with macvtap)
290 - $(use_enable nls)
291 - $(use_with numa numactl)
292 - $(use_with numa numad)
293 - $(use_with openvz)
294 - $(use_with parted storage-disk)
295 - $(use_with pcap libpcap)
296 - $(use_with phyp)
297 - $(use_with policykit polkit)
298 - $(use_with qemu)
299 - $(use_with qemu yajl)
300 - $(use_with rbd storage-rbd)
301 - $(use_with sasl)
302 - $(use_with selinux)
303 - $(use_with udev)
304 - $(use_with uml)
305 - $(use_with vepa virtualport)
306 - $(use_with virt-network network)
307 - $(use_with wireshark-plugins wireshark-dissector)
308 - $(use_with xen libxl)
309 - $(use_with zeroconf avahi)
310 - $(use_with zfs storage-zfs)
311 -
312 - --without-hal
313 - --without-netcf
314 - --without-sanlock
315 -
316 - --with-esx
317 - --with-init-script=systemd
318 - --with-qemu-group=$(usex caps qemu root)
319 - --with-qemu-user=$(usex caps qemu root)
320 - --with-remote
321 - --with-storage-fs
322 - --with-vmware
323 -
324 - --disable-static
325 - --disable-werror
326 -
327 - --with-html-subdir=${PF}/html
328 - --localstatedir=/var
329 - )
330 -
331 - if use virtualbox && has_version app-emulation/virtualbox-ose; then
332 - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
333 - else
334 - myeconfargs+=( $(use_with virtualbox vbox) )
335 - fi
336 -
337 - econf "${myeconfargs[@]}"
338 -
339 - if [[ ${PV} = *9999* ]]; then
340 - # Restore gnulib's config.sub and config.guess
341 - # bug #377279
342 - (cd .gnulib && git reset --hard > /dev/null)
343 - fi
344 -}
345 -
346 -src_test() {
347 - cd "${BUILD_DIR}"
348 -
349 - # remove problematic tests, bug #591416, bug #591418
350 - sed -i -e 's#commandtest$(EXEEXT) # #' \
351 - -e 's#virfirewalltest$(EXEEXT) # #' \
352 - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
353 - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
354 - tests/Makefile
355 -
356 - export VIR_TEST_DEBUG=1
357 - HOME="${T}" emake check || die "tests failed"
358 -}
359 -
360 -src_install() {
361 - emake DESTDIR="${D}" \
362 - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
363 -
364 - find "${D}" -name '*.la' -delete || die
365 -
366 - # Remove bogus, empty directories. They are either not used, or
367 - # libvirtd is able to create them on demand
368 - rm -rf "${D}"/etc/sysconfig
369 - rm -rf "${D}"/var
370 -
371 - use libvirtd || return 0
372 - # From here, only libvirtd-related instructions, be warned!
373 -
374 - systemd_install_serviced \
375 - "${FILESDIR}"/libvirtd.service.conf libvirtd.service
376 -
377 - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
378 -
379 - newinitd "${S}/libvirtd.init" libvirtd || die
380 - newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
381 - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
382 - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
383 -
384 - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
385 - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
386 -
387 - newbashcomp "${S}/tools/bash-completion/vsh" vsh
388 - bashcomp_alias vsh virsh virt-admin
389 -
390 - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
391 - DISABLE_AUTOFORMATTING=true
392 - readme.gentoo_create_doc
393 -}
394 -
395 -pkg_preinst() {
396 - # we only ever want to generate this once
397 - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
398 - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
399 - fi
400 -}
401 -
402 -pkg_postinst() {
403 - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
404 - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
405 - fi
406 -
407 - use libvirtd || return 0
408 - # From here, only libvirtd-related instructions, be warned!
409 -
410 - readme.gentoo_print_elog
411 -}
412
413 diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
414 index 88e6c96b8d8..870d636e83d 100644
415 --- a/app-emulation/libvirt/metadata.xml
416 +++ b/app-emulation/libvirt/metadata.xml
417 @@ -38,9 +38,6 @@
418 <flag name="openvz">
419 Support management of OpenVZ virtualisation (openvz-sources)
420 </flag>
421 - <flag name="uml">
422 - Support management of User Mode Linux virtualisation
423 - </flag>
424 <flag name="qemu">
425 Support management of QEMU virtualisation (<pkg>app-emulation/qemu</pkg>)
426 </flag>