commit:     1394e20bfe144f289aacab1e609b4c883a35cf20
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 01:03:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 01:04:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1394e20b

app-emulation/libvirt: drop versions

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/libvirt/Manifest                     |  12 -
 ...ibxl-Fix-libvirtd-crash-on-domain-restore.patch |  37 ---
 ...tation-fault-in-virtqemud-executing-qemuD.patch |  50 ---
 app-emulation/libvirt/libvirt-7.10.0-r3.ebuild     | 338 --------------------
 app-emulation/libvirt/libvirt-8.0.0-r2.ebuild      | 337 --------------------
 app-emulation/libvirt/libvirt-8.1.0.ebuild         | 338 --------------------
 app-emulation/libvirt/libvirt-8.3.0.ebuild         | 340 --------------------
 app-emulation/libvirt/libvirt-8.4.0.ebuild         | 340 --------------------
 app-emulation/libvirt/libvirt-8.5.0.ebuild         | 341 ---------------------
 9 files changed, 2133 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 057ce4489084..25aea9f44d2a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,18 +1,6 @@
-DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 
6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb
 SHA512 
c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
-DIST libvirt-7.10.0.tar.xz.asc 833 BLAKE2B 
b9e129dcce43a87320b7284264c0689ce45742c0038a68c86fe7a0b789ddc2a49794fe89ae30d4d3675e884891a3b335b61beeb7ff0c5291fbc763ca6629de40
 SHA512 
41ef8e5fe9a8d1d6ba1c4fa8bd8204b0be83b50d3c936765d7ad005e75600287de0f13e0b14fab4d94d2d4b8bf8916fbe869cbfccf6293cc61c854513a0ef0c3
 DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 
93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c
 SHA512 
a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
 DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 
86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030
 SHA512 
d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
-DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 
4669ae8f4de6379c3f94d3b6875ccc8eb435fbbf96aac26642fc593bc1921e9189decd9d366f5ca9e3e0fd8392ce840dce9e50ae048a5a2b72c465fd514eaf73
 SHA512 
e84cf2753d3c57cfe5aadbb6601fa76e0ba750471c1c24631720fe64376c3599ea252863ec671a50527e4fb380ffe0c2f02f07705b4b87d373ccf3e516ff4b1c
-DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 
2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc
 SHA512 
ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b
-DIST libvirt-8.1.0.tar.xz 8881608 BLAKE2B 
ddbd684f43a75ab04aca8be0a761ec5890c365e3c802af55e85d0f3b906a3b075f737acd14648d46cdacce90cbd2ccdda12d39784eaa17a05657b13447df1fe7
 SHA512 
5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97
-DIST libvirt-8.1.0.tar.xz.asc 833 BLAKE2B 
21ea45127d68313264b9e17c315d75b20e409ef56ce3f6a61899c3c9d9ce1ff51a4743d912f7440d2197230df802d955516cbc8d6f98960cef8a0265a7d0f334
 SHA512 
9a28b0405c01518f7d6837d02df492d6d97d6e73cd711e718b53cc18d8830a1216aa87366b2065ef5ce65b12d72cbb3d80024529264430de20fe89d8bf595d76
 DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 
85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d
 SHA512 
fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544
 DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 
3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa
 SHA512 
33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b
-DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 
37890dac8f46e14c5f0329f7f3318b611bfe3b97b7beddcdb91541e71a619738baa2a3e9847fee2d0b63abb630895860555a5337686702fc6fb06cc4f060f8b5
 SHA512 
914c8a4884d703f368849b852ba8330d1b17cf598a359f70d344e0a94e02f60337216e9011cbeba90eb4e87fa644e7eb9e8a407ca58632b2b41511d3f598ff71
-DIST libvirt-8.3.0.tar.xz.asc 833 BLAKE2B 
d1faf041532fc4c33641cab0510401db2fb1c45004f2615df6807729d7a83a8a28bd2410eb5478e479e7cd1b28272ee92885b30ecdccb8a9390536df51377d5e
 SHA512 
5c32087769aba0d2a245a4ce317e1428842a682cf71e03e5f33fc4476309f40c08118241b1ad2b4be14933971431960b89960858a1f841ab1b7c9bda9f571d52
-DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 
479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1
 SHA512 
e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
-DIST libvirt-8.4.0.tar.xz.asc 833 BLAKE2B 
7bfbfc05ce7d95018c07e92d475bc0fddbb0b396132c12defd0205638d22534ba83fea8180345635b9f59b8a10fd3177b1a84ad748f1ddb9e533e11700bd4cbd
 SHA512 
5d85ce4764dc36d940033c5feda59b9cff64844a52e3a25b1b8d0278adbc2378978a7dbe6f577f82bc760d617edc75c4a6ab8e1325a38847e1d40e3bf7c9684b
-DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B 
a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9
 SHA512 
62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
-DIST libvirt-8.5.0.tar.xz.asc 833 BLAKE2B 
2e4ee3309e409fa700b0e09c067d2d7978f5033bc947108012582a9ba4b6a5438a2f419375e10b342dd0082560768eab1913aea86558293abc9a51bdb87111eb
 SHA512 
d05482a7d0ef5649428368553e7a9c49a116435b273179c13248081711ecc2d8fa1f6ad82a3d5ce43efc2afee51718bc3362e483463c61ebd10dbcc41875749e
 DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 
131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5
 SHA512 
35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
 DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B 
ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c
 SHA512 
5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8

diff --git 
a/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
 
b/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
deleted file mode 100644
index f6116aa535d2..000000000000
--- 
a/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 454b927d1e33a1fe9dca535db2c97300fdae62cc Mon Sep 17 00:00:00 2001
-Message-Id: 
<454b927d1e33a1fe9dca535db2c97300fdae62cc.1646730306.git.mpriv...@redhat.com>
-From: Jim Fehlig <[email protected]>
-Date: Thu, 17 Feb 2022 11:48:13 -0700
-Subject: [PATCH] libxl: Fix libvirtd crash on domain restore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit cc2a3c2a94 missed one case in the libxl driver where virDomainDef
-is returned from libxlDomainSaveImageOpen and a g_steal_pointer is needed.
-Without it, the virDomainDef object is freed and the driver crashes later
-in the restore process when accessing the object.
-
-Signed-off-by: Jim Fehlig <[email protected]>
-Reviewed-by: Ján Tomko <[email protected]>
-Signed-off-by: Michal Privoznik <[email protected]>
----
- src/libxl/libxl_domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index c91e531a9a..ee031267ca 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -811,7 +811,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver,
-                                         VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
-         goto error;
- 
--    *ret_def = def;
-+    *ret_def = g_steal_pointer(&def);
-     *ret_hdr = hdr;
- 
-     return fd;
--- 
-2.34.1
-

diff --git 
a/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
 
b/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
deleted file mode 100644
index f37ec7065afd..000000000000
--- 
a/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-Message-Id: 
<823a62ec8aac4fb75e6e281164f3eb56ae47597c.1646211032.git.mpriv...@redhat.com>
-From: Boris Fiuczynski <[email protected]>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, 
flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags 
(domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at 
../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags 
(server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, 
rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, 
client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized 
out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, 
client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, 
server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at 
../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, 
prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at 
../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at 
../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at 
../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at 
../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <[email protected]>
-Reviewed-by: Jim Fehlig <[email protected]>
-Reviewed-by: Michal Privoznik <[email protected]>
-Signed-off-by: Michal Privoznik <[email protected]>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-2.34.1
-

diff --git a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild 
b/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
deleted file mode 100644
index 7c4d799d196f..000000000000
--- a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-       SRC_URI=""
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.48.0
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/readline:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:0= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-       "${FILESDIR}"/${PN}-7.9.0-fix_cgroupv2.patch
-       "${FILESDIR}"/${PN}-7.10.0-fix_soname.patch
-       "${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild
deleted file mode 100644
index d0232f98e39a..000000000000
--- a/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-       SRC_URI=""
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.48.0
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/readline:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:0= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-       "${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-       
"${FILESDIR}"/${PN}-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-8.1.0.ebuild 
b/app-emulation/libvirt/libvirt-8.1.0.ebuild
deleted file mode 100644
index bdc9eb2b9f6e..000000000000
--- a/app-emulation/libvirt/libvirt-8.1.0.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with dev-python/libvirt-python!
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-       SRC_URI=""
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.48.0
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/readline:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:0= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-8.3.0.ebuild 
b/app-emulation/libvirt/libvirt-8.3.0.ebuild
deleted file mode 100644
index 6128a61b974d..000000000000
--- a/app-emulation/libvirt/libvirt-8.3.0.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.56.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.7:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               >=dev-libs/yajl-2.0.3:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-8.4.0.ebuild 
b/app-emulation/libvirt/libvirt-8.4.0.ebuild
deleted file mode 100644
index 1ac6f7431bdb..000000000000
--- a/app-emulation/libvirt/libvirt-8.4.0.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.56.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.7:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               >=dev-libs/yajl-2.0.3:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-8.5.0.ebuild 
b/app-emulation/libvirt/libvirt-8.5.0.ebuild
deleted file mode 100644
index f81dbc7d518b..000000000000
--- a/app-emulation/libvirt/libvirt-8.5.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-               verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-       parted pcap policykit +qemu rbd sasl selinux +udev
-       virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-BDEPEND="
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       dev-python/docutils
-       virtual/pkgconfig
-       net-libs/rpcsvc-proto
-       bash-completion? ( >=app-shells/bash-completion-2.0 )
-       verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-       acct-user/qemu
-       app-misc/scrub
-       >=dev-libs/glib-2.56.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.7:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-2.11
-               >=dev-libs/yajl-2.0.3:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6(+)]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-       "${FILESDIR}"/${PN}-8.5.0-glibc-2.36.patch
-)
-
-pkg_setup() {
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature openvz driver_openvz)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu yajl)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature udev)
-               $(meson_feature virt-network driver_network)
-               $(meson_feature virtualbox driver_vbox)
-               $(meson_feature wireshark-plugins wireshark_dissector)
-               $(meson_feature xen driver_libxl)
-               $(meson_feature zfs storage_zfs)
-
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-
-               -Ddriver_esx=enabled
-               -Dinit_script=systemd
-               -Dqemu_user=$(usex caps qemu root)
-               -Dqemu_group=$(usex caps qemu root)
-               -Ddriver_remote=enabled
-               -Dstorage_fs=enabled
-               -Ddriver_vmware=enabled
-
-               --localstatedir="${EPREFIX}/var"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       # Don't run the syntax check tests, they're fragile and not relevant
-       # to us downstream anyway.
-       # We also crank up the timeout (as Fedora does) just to preempt failures
-       # on slower arches.
-       meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-       meson_src_install
-
-       # Depending on configuration option, libvirt will create some bogus
-       # directoreis. They are either not used, or libvirtd is able to create
-       # them on demand, so let's remove them.
-       #
-       # Note, we are using -f here so that rm does not fail or warn if the
-       # directory is nonexistent.
-       rm -rf "${D}"/etc/sysconfig
-       rm -rf "${D}"/var
-       rm -rf "${D}"/run
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-       tmpfiles_process libvirtd.conf
-       readme.gentoo_print_elog
-}

Reply via email to