1 |
commit: c122fff41902ba3749531883044eb6121ff4dc49 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 27 15:05:24 2017 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 27 15:12:21 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c122fff4 |
7 |
|
8 |
app-emulation/libvirt: drop old, bug #629462 |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
app-emulation/libvirt/Manifest | 1 - |
13 |
app-emulation/libvirt/libvirt-3.3.0.ebuild | 382 ----------------------------- |
14 |
2 files changed, 383 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest |
17 |
index 3b446623061..3bd43fe342a 100644 |
18 |
--- a/app-emulation/libvirt/Manifest |
19 |
+++ b/app-emulation/libvirt/Manifest |
20 |
@@ -1,2 +1 @@ |
21 |
-DIST libvirt-3.3.0.tar.xz 14043384 SHA256 29e00984174e33cf2183b478382c017de26860452ffee17b73871051264ebb1b SHA512 69166ddd7d4b9ef3b1bf2466e781139ef9b4d224a64acc7b8e6fca8786d36482138a1fe7b7407c0fca3b3d012cb418d168671a3e65e428f023c16493b7718c2d WHIRLPOOL 1b2688f6b9a89608677070b5ce1fd2b2af115336126d4214071bc1abba25056d54dbbf16d6bdfab7582b252a833d3e53e51175d552d5c936b08973c0eed76643 |
22 |
DIST libvirt-3.6.0.tar.xz 14797704 SHA256 3a2c97f6950796f300f6a2e0404f4de8e51c3b9430cdb82738439adb0ac59e3d SHA512 6cde735a18cb71c9e6dbb25cd2a8f9c72d55ad7d74bdf97b00d784593f0bc59498917fb235ce04de4428899241520d87bf19c015b80282b3d0c12918d9b8b288 WHIRLPOOL 8185ad998158bac9aa6bc0dd0f590a3d9fb393ad94d308bdc84e60ac5c56e110d5f4a2355e2a10b01a6521d8261ae7484aee275e12a17cc7f2830f169e990596 |
23 |
|
24 |
diff --git a/app-emulation/libvirt/libvirt-3.3.0.ebuild b/app-emulation/libvirt/libvirt-3.3.0.ebuild |
25 |
deleted file mode 100644 |
26 |
index 66c3fa5acfb..00000000000 |
27 |
--- a/app-emulation/libvirt/libvirt-3.3.0.ebuild |
28 |
+++ /dev/null |
29 |
@@ -1,382 +0,0 @@ |
30 |
-# Copyright 1999-2017 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 |
36 |
- |
37 |
-if [[ ${PV} = *9999* ]]; then |
38 |
- inherit git-r3 |
39 |
- EGIT_REPO_URI="git://libvirt.org/libvirt.git" |
40 |
- SRC_URI="" |
41 |
- KEYWORDS="amd64 x86" |
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 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 elibc_glibc |
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-misc/curl-7.18.0 |
91 |
- sys-apps/dmidecode |
92 |
- >=sys-apps/util-linux-2.17 |
93 |
- sys-devel/gettext |
94 |
- sys-libs/ncurses:0= |
95 |
- sys-libs/readline:= |
96 |
- apparmor? ( sys-libs/libapparmor ) |
97 |
- audit? ( sys-process/audit ) |
98 |
- caps? ( sys-libs/libcap-ng ) |
99 |
- dbus? ( sys-apps/dbus ) |
100 |
- elibc_glibc? ( sys-libs/glibc[rpc(+)] ) |
101 |
- firewalld? ( net-firewall/firewalld ) |
102 |
- fuse? ( >=sys-fs/fuse-2.8.6 ) |
103 |
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
104 |
- iscsi? ( sys-block/open-iscsi ) |
105 |
- libssh? ( net-libs/libssh ) |
106 |
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
107 |
- nfs? ( net-fs/nfs-utils ) |
108 |
- numa? ( |
109 |
- >sys-process/numactl-2.0.2 |
110 |
- sys-process/numad |
111 |
- ) |
112 |
- openvz? ( sys-kernel/openvz-sources:* ) |
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.0.0-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 |
-) |
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 |
- ~NET_ACT_POLICE |
223 |
- ~NET_CLS_FW |
224 |
- ~NET_CLS_U32 |
225 |
- ~NET_SCH_HTB |
226 |
- ~NET_SCH_INGRESS |
227 |
- ~NET_SCH_SFQ" |
228 |
- |
229 |
- # Handle specific kernel versions for different features |
230 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
231 |
- if kernel_is ge 3 6; then |
232 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
233 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
234 |
- fi |
235 |
- |
236 |
- ERROR_USER_NS="Optional depending on LXC configuration." |
237 |
- |
238 |
- if [[ -n ${CONFIG_CHECK} ]]; then |
239 |
- linux-info_pkg_setup |
240 |
- fi |
241 |
-} |
242 |
- |
243 |
-src_prepare() { |
244 |
- touch "${S}/.mailmap" |
245 |
- |
246 |
- default |
247 |
- |
248 |
- if [[ ${PV} = *9999* ]]; then |
249 |
- # git checkouts require bootstrapping to create the configure script. |
250 |
- # Additionally the submodules must be cloned to the right locations |
251 |
- # bug #377279 |
252 |
- ./bootstrap || die "bootstrap failed" |
253 |
- ( |
254 |
- git submodule status | sed 's/^[ +-]//;s/ .*//' |
255 |
- git hash-object bootstrap.conf |
256 |
- ) >.git-module-status |
257 |
- fi |
258 |
- |
259 |
- # Tweak the init script: |
260 |
- cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die |
261 |
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
262 |
- -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ |
263 |
- -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ |
264 |
- -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ |
265 |
- -i "${S}/libvirtd.init" || die "sed failed" |
266 |
- |
267 |
- eautoreconf |
268 |
-} |
269 |
- |
270 |
-src_configure() { |
271 |
- local myeconfargs=( |
272 |
- $(use_with apparmor) |
273 |
- $(use_with apparmor apparmor-profiles) |
274 |
- $(use_with audit) |
275 |
- $(use_with caps capng) |
276 |
- $(use_with dbus) |
277 |
- $(use_with firewalld) |
278 |
- $(use_with fuse) |
279 |
- $(use_with glusterfs) |
280 |
- $(use_with glusterfs storage-gluster) |
281 |
- $(use_with iscsi storage-iscsi) |
282 |
- $(use_with libvirtd) |
283 |
- $(use_with libssh) |
284 |
- $(use_with lvm storage-lvm) |
285 |
- $(use_with lvm storage-mpath) |
286 |
- $(use_with lxc) |
287 |
- $(use_with macvtap) |
288 |
- $(use_enable nls) |
289 |
- $(use_with numa numactl) |
290 |
- $(use_with numa numad) |
291 |
- $(use_with openvz) |
292 |
- $(use_with parted storage-disk) |
293 |
- $(use_with pcap libpcap) |
294 |
- $(use_with phyp) |
295 |
- $(use_with policykit polkit) |
296 |
- $(use_with qemu) |
297 |
- $(use_with qemu yajl) |
298 |
- $(use_with rbd storage-rbd) |
299 |
- $(use_with sasl) |
300 |
- $(use_with selinux) |
301 |
- $(use_with udev) |
302 |
- $(use_with uml) |
303 |
- $(use_with vepa virtualport) |
304 |
- $(use_with virt-network network) |
305 |
- $(use_with wireshark-plugins wireshark-dissector) |
306 |
- $(use_with xen) |
307 |
- $(use_with xen xen-inotify) |
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 |
- --without-xenapi |
316 |
- |
317 |
- --with-esx |
318 |
- --with-init-script=systemd |
319 |
- --with-qemu-group=$(usex caps qemu root) |
320 |
- --with-qemu-user=$(usex caps qemu root) |
321 |
- --with-remote |
322 |
- --with-storage-fs |
323 |
- --with-vmware |
324 |
- |
325 |
- --disable-static |
326 |
- --disable-werror |
327 |
- |
328 |
- --with-html-subdir=${PF}/html |
329 |
- --localstatedir=/var |
330 |
- ) |
331 |
- |
332 |
- if use virtualbox && has_version app-emulation/virtualbox-ose; then |
333 |
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) |
334 |
- else |
335 |
- myeconfargs+=( $(use_with virtualbox vbox) ) |
336 |
- fi |
337 |
- |
338 |
- econf "${myeconfargs[@]}" |
339 |
- |
340 |
- if [[ ${PV} = *9999* ]]; then |
341 |
- # Restore gnulib's config.sub and config.guess |
342 |
- # bug #377279 |
343 |
- (cd .gnulib && git reset --hard > /dev/null) |
344 |
- fi |
345 |
-} |
346 |
- |
347 |
-src_test() { |
348 |
- cd "${BUILD_DIR}" |
349 |
- |
350 |
- # remove problematic tests, bug #591416, bug #591418 |
351 |
- sed -i -e 's#commandtest$(EXEEXT) # #' \ |
352 |
- -e 's#virfirewalltest$(EXEEXT) # #' \ |
353 |
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ |
354 |
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ |
355 |
- tests/Makefile |
356 |
- |
357 |
- export VIR_TEST_DEBUG=1 |
358 |
- HOME="${T}" emake check || die "tests failed" |
359 |
-} |
360 |
- |
361 |
-src_install() { |
362 |
- emake DESTDIR="${D}" \ |
363 |
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
364 |
- |
365 |
- find "${D}" -name '*.la' -delete || die |
366 |
- |
367 |
- # Remove bogus, empty directories. They are either not used, or |
368 |
- # libvirtd is able to create them on demand |
369 |
- rm -rf "${D}"/etc/sysconfig |
370 |
- rm -rf "${D}"/var/cache |
371 |
- rm -rf "${D}"/var/run |
372 |
- rm -rf "${D}"/var/log |
373 |
- |
374 |
- use libvirtd || return 0 |
375 |
- # From here, only libvirtd-related instructions, be warned! |
376 |
- |
377 |
- systemd_install_serviced \ |
378 |
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service |
379 |
- |
380 |
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
381 |
- |
382 |
- newinitd "${S}/libvirtd.init" libvirtd || die |
383 |
- newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die |
384 |
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die |
385 |
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die |
386 |
- |
387 |
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die |
388 |
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die |
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 |
-} |