commit:     ef3fbdc9009cda15df509eee2ac0bcdd187155ec
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 16:30:08 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 16:32:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3fbdc9

app-emulation/libvirt: drop old versions

Bug: https://bugs.gentoo.org/812317
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/libvirt/Manifest                     |  16 -
 .../libvirt/files/libvirt-6.7.0-doc-path.patch     |   9 -
 .../libvirt-7.0.0-fix_virtproxyd_unit_file.patch   |  18 --
 ...ix-virCgroupKillRecursive-wrt-nested-cont.patch | 189 -----------
 app-emulation/libvirt/libvirt-7.0.0-r4.ebuild      | 348 ---------------------
 app-emulation/libvirt/libvirt-7.1.0-r2.ebuild      | 335 --------------------
 app-emulation/libvirt/libvirt-7.2.0-r2.ebuild      | 329 -------------------
 app-emulation/libvirt/libvirt-7.3.0-r1.ebuild      | 326 -------------------
 app-emulation/libvirt/libvirt-7.4.0-r1.ebuild      | 327 -------------------
 app-emulation/libvirt/libvirt-7.5.0-r1.ebuild      | 327 -------------------
 app-emulation/libvirt/libvirt-7.8.0-r1.ebuild      | 336 --------------------
 app-emulation/libvirt/libvirt-7.9.0-r2.ebuild      | 337 --------------------
 12 files changed, 2897 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5cde70f50158..3061acc0eb02 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,20 +1,4 @@
-DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 
0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05
 SHA512 
dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
-DIST libvirt-7.0.0.tar.xz.asc 833 BLAKE2B 
7cc16442f39de660caa38801b12994ca312b250d6c3e5bbef38613702a03cd31cb9b7eaa792af4f8c1b737d67e62f18baa02b481e7fa4d6ec8fc9a07a44db4de
 SHA512 
fb0b6240dbb4e827456f6c573bb3466f19282383bcee5bae8ece923260eca6d252f64b1adfac9a26fdac2a57bb9390aa4c0071e54d16d3e294230b3562764f18
-DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 
97a76091616b427fc64a6a3caf5d9b04d7b9aed7ff7a6d70536ca2eb95d902f0f5ed4b5e56fbdfc6c40f443fb68f4850cff0545256826e575e78fea97158e8f7
 SHA512 
475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
-DIST libvirt-7.1.0.tar.xz.asc 833 BLAKE2B 
2610cff98967260a5005840e1b03cff16790da82d9a51f14d6b34453db3ba89aa34915bba69d57b333f50d17e2492c77e85ee4e6282b8fe5f4cd0f7ace638334
 SHA512 
6c92c91bc7f23b32deee3442008b44d6469a9cabf2ed39459afcbfce9b3f2b1b655514a068c4bcdc8909ba02a0a4762e8f845ae4dba8da18719acf45614ca6da
 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.2.0.tar.xz 8661052 BLAKE2B 
eae6b4e7422690dd780e1647e2a39dfdff0562f3e63bce9ca5ee34540dec3755269efaad459d1b516b56fdeb1503cc966ffa60378aaa18210b972b739716fe34
 SHA512 
f6bb26ca7cb5a8d342f1f39afd051ed76b71414e1b934557cf50784da17e4f2fb3301c2ace3b593fcdeb6a18ad559a007ad594111c2c348b9157d3a59d475928
-DIST libvirt-7.2.0.tar.xz.asc 833 BLAKE2B 
c389d80ef4f7627230b88446ef77daab1bf34e49e20cfb5c5418500fdf388af23aeb2458551548cb732c868f87f35a5c28acff8c01faebe985a6953953a69149
 SHA512 
526955a9f9d294635e63a4ed20c3e478fb4b5f3a63150a59ff30d84ad16a286ddb4c6508d0317c56df63a0d22a099085697df344fe2b15bce07acf9f05cda331
-DIST libvirt-7.3.0.tar.xz 8680468 BLAKE2B 
88ad3dbac627203419eb80b28649613480a287014688b5b75b9a18d60b3d2b2c6628c803384ce0eed81bf84cdc0dd8539b072f32ccf0319f09bebaaeb0e089bf
 SHA512 
e039d5cc000c0f29ead4faddf154852ee8d8b5943e940b717eabb33cc9990d3f257a942b05a661bf6c36df5b5763c31df3f8b5a0fc21e8111a81c57da42d903e
-DIST libvirt-7.3.0.tar.xz.asc 833 BLAKE2B 
812a7cf4bcaef88a4229008579a18da19d78b0a988890359907e4067b5eb6d74176907875a3a27775ffabaf29fb4d0e92c7f2ec13042ef8657c09ad6b287984d
 SHA512 
f5349bb6c7919b54518a2ffc058592fb588045d37d18dfce5efb7e2f512c2a19b0f956d6ee34a16982cdaec4c23954300f7e130656afeb3cf535c65a0d62c04e
-DIST libvirt-7.4.0.tar.xz 8617788 BLAKE2B 
06271895ac39865df632b6ad669eb20d1f1bb774b4a854ee2461174ac5ccf688b0f8ecffc2d9d0b12491e0e948beb377d52efdf40a2729d14b4b3d9bc8835cc2
 SHA512 
efe3fb2813613c3c5e94ed49d0cae4ad92cca6a727a8b55808d8c3bdfacb355642796dfab49362ee59654f9471f9134b96374ced50cc9b3227f4f1c6201bf7f1
-DIST libvirt-7.4.0.tar.xz.asc 833 BLAKE2B 
c9d63bb9cdd604663754ccd927a5a1305131617b1d4edb51d289878ff67b7168e882ec1bf0f16aaea509aa32b8419a3c6420615051bd8f42216ce9d1aeae601b
 SHA512 
9a887cf73fb494e55617a69863a0877fba56d180fecbec892a7990f76bc6e1fe15871b4e688e88289eb7acf3ab4a70c1d6202b224cf3c9a96ecb1ecfb2279b2c
-DIST libvirt-7.5.0.tar.xz 8642788 BLAKE2B 
467dbd2a337beee5d9f10de7bc37ca988e85fad17fb75e6ab73c13cf79eceab27c9ff51bbe2ac9f6c121feed4c67860fa263e601e10f6b1dd7b8a647b53228a7
 SHA512 
cf89800c8970b8b1373ee32cc49ea88b87e76b50fd134df5da354be83e0ef490e514f16425c1c16eb3989fbadd3ba7d9976972fbbae6cb40db3d2ae94863219d
-DIST libvirt-7.5.0.tar.xz.asc 833 BLAKE2B 
ab9ba2a02e4af90002fffbcd0bc04f9faa1d5a23ab815d6b9b6ef1410d9d114fc07c1b29850b59d1ab4ea3a186f4b7d65f5a5ca37d65f3034146617445849dcb
 SHA512 
ebcc1fcce10e19e0a4ae43fbf9bfd5b1b7732829eeb3543c84ba24e0a5d9872be692e7b6c105cdcd730d1c26b895b306387ab380623acf6bba242bd2c62ec7b2
 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-7.8.0.tar.xz 8735184 BLAKE2B 
44ad9465a0bcb683777677de87e422741fe88d604297297f859ba94378b91b80855b9d4cd91de60a1c140c6dc2b4cb61020296933f68526605945e8accfadbcb
 SHA512 
0fe31b70178d662a5c8019ef424568b95d9d4c2eb74113c1b697ccf4eef1e110c3095e19835cef2c9459a694a5f4785b0761c19ec78062af88c39651291fa040
-DIST libvirt-7.8.0.tar.xz.asc 833 BLAKE2B 
10d315ec715a9ede62103276631ca4ac95feb543faea984e108f4d74857dbc3929d799a7b28d1816a3a6736fa388489a0c44ec01c6eef27528a94f997e8b2d65
 SHA512 
283c486ca9a56442f9aaead20e71e496a169f902ea33ad7ffe2a830630a50b4314abdd477727c502d3c273506f2a0014079420079907b568da449aaf546f3b60
-DIST libvirt-7.9.0.tar.xz 8785056 BLAKE2B 
524b9bbddcf45d441a5b306bdb44bf1d1e54a9dd6867fb7daed833e58d5324cdc3f3d57601b4d2df7e19ace4df73868e45b291bf58813bbd9b746304ac940f55
 SHA512 
7185ac3da41f662b8142d144a1360f5ed5471812e6961933f2f404a7b88f32739b9b780c809bb8ce04dd56ff13d4486f60dd6725a660cf9f019e15cae49b36bf
-DIST libvirt-7.9.0.tar.xz.asc 833 BLAKE2B 
295174bcf25352dec83508e7e36cc6e6d12ac514217ed6e27fa3d6dac8b1365d4b8f335ffadd8c33ab70e164f6f82639abf5e496844a23c3f0bf0c557dec56c8
 SHA512 
570b33dfc0f58c6322d41d3990e4d6f670a10311c221b1b3cd5a746e58e51e520214649891386e5b289c118735e9c17a1f9f478b50fa69c732ca3811074c8c8c

diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch 
b/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch
deleted file mode 100644
index 65eb35f3e346..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/meson.build       2020-09-26 21:25:08.557345415 +0000
-+++ b/meson.build       2020-09-26 21:25:59.507348156 +0000
-@@ -84,7 +84,7 @@ sbindir = prefix / get_option('sbindir')
- sharedstatedir = prefix / get_option('sharedstatedir')
- 
- confdir = sysconfdir / meson.project_name()
--docdir = datadir / 'doc' / meson.project_name()
-+docdir = datadir / 'doc' / '@0@-@1@'.format(meson.project_name(), 
meson.project_version())
- pkgdatadir = datadir / meson.project_name()

diff --git 
a/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch 
b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch
deleted file mode 100644
index a8ee5dcee3fe..000000000000
--- a/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/792228
-https://gitlab.com/libvirt/libvirt/-/commit/e3d60f7
-
--- 
-diff --git a/src/remote/meson.build b/src/remote/meson.build
-index 
9ad2f6ab1c268012a263ab4ede6410fb80e14a12..0a188268b58b7af41645799aac3ef3f156fd48ad
 100644
---- a/src/remote/meson.build
-+++ b/src/remote/meson.build
-@@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE')
-       'name': 'Libvirt proxy',
-       'sockprefix': 'libvirt',
-       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
--      'deps': libvirtd_socket_conflicts,
-+      'deps': 'Conflicts=' + libvirtd_socket_conflicts,
-     }
- 
-     openrc_init_files += {
-

diff --git 
a/app-emulation/libvirt/files/libvirt-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch
 
b/app-emulation/libvirt/files/libvirt-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch
deleted file mode 100644
index 69572b321cfb..000000000000
--- 
a/app-emulation/libvirt/files/libvirt-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From ea7d0ca37cce76e1327945c4864b996d7fd6d2e6 Mon Sep 17 00:00:00 2001
-Message-Id: 
<ea7d0ca37cce76e1327945c4864b996d7fd6d2e6.1618903455.git.mpriv...@redhat.com>
-From: Michal Privoznik <[email protected]>
-Date: Fri, 16 Apr 2021 16:39:14 +0200
-Subject: [PATCH] vircgroup: Fix virCgroupKillRecursive() wrt nested
- controllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I've encountered the following bug, but only on Gentoo with
-systemd and CGroupsV2. I've started an LXC container successfully
-but destroying it reported the following error:
-
-  error: Failed to destroy domain 'amd64'
-  error: internal error: failed to get cgroup backend for 'pathOfController'
-
-Debugging showed, that CGroup hierarchy is full of surprises:
-
-/sys/fs/cgroup/machine.slice/machine-lxc\x2d861\x2damd64.scope/
-└── libvirt
-    ├── dev-hugepages.mount
-    ├── dev-mqueue.mount
-    ├── init.scope
-    ├── sys-fs-fuse-connections.mount
-    ├── sys-kernel-config.mount
-    ├── sys-kernel-debug.mount
-    ├── sys-kernel-tracing.mount
-    ├── system.slice
-    │   ├── console-getty.service
-    │   ├── dbus.service
-    │   ├── system-getty.slice
-    │   ├── system-modprobe.slice
-    │   ├── systemd-journald.service
-    │   ├── systemd-logind.service
-    │   └── tmp.mount
-    └── user.slice
-
-For comparison, here's the same container on recent Rawhide:
-
-/sys/fs/cgroup/machine.slice/machine-lxc\x2d13550\x2damd64.scope/
-└── libvirt
-
-Anyway, those nested directories should not be a problem, because
-virCgroupKillRecursiveInternal() removes them recursively, right?
-Sort of. The function really does remove nested directories, but
-it assumes that every directory has the same controller as the
-rest. Just take a look at virCgroupV2KillRecursive() - it gets
-'Any' controller (the first one it found in ".scope") and then
-passes it to virCgroupKillRecursiveInternal().
-
-This assumption is not true though. The controllers found in
-".scope" are the following:
-
-  cpuset cpu io memory pids
-
-while "libvirt" has fewer:
-
-  cpuset cpu io memory
-
-Up until now it's not problem, because of how we order
-controllers internally - "cpu" is the first and thus picking
-"Any" controller returns just that. But the rest of directories
-has no controllers, their "cgroup.controllers" is just empty.
-
-What fixes the bug is dropping @controller argument from
-virCgroupKillRecursiveInternal() and letting each iteration work
-pick its own controller.
-
-Signed-off-by: Michal Privoznik <[email protected]>
-Reviewed-by: Pavel Hrdina <[email protected]>
----
- src/util/vircgroup.c     | 25 +++++++++++++++++++++++--
- src/util/vircgrouppriv.h |  1 -
- src/util/vircgroupv1.c   |  7 +------
- src/util/vircgroupv2.c   |  7 +------
- 4 files changed, 25 insertions(+), 15 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 96280a0a4e..37dde2a5ed 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1477,6 +1477,24 @@ virCgroupHasController(virCgroup *cgroup, int 
controller)
- }
- 
- 
-+static int
-+virCgroupGetAnyController(virCgroup *cgroup)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (!cgroup->backends[i])
-+            continue;
-+
-+        return cgroup->backends[i]->getAnyController(cgroup);
-+    }
-+
-+    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                   _("Unable to get any controller"));
-+    return -1;
-+}
-+
-+
- int
- virCgroupPathOfController(virCgroup *group,
-                           unsigned int controller,
-@@ -2715,11 +2733,11 @@ int
- virCgroupKillRecursiveInternal(virCgroup *group,
-                                int signum,
-                                GHashTable *pids,
--                               int controller,
-                                const char *taskFile,
-                                bool dormdir)
- {
-     int rc;
-+    int controller;
-     bool killedAny = false;
-     g_autofree char *keypath = NULL;
-     g_autoptr(DIR) dp = NULL;
-@@ -2728,6 +2746,9 @@ virCgroupKillRecursiveInternal(virCgroup *group,
-     VIR_DEBUG("group=%p signum=%d pids=%p taskFile=%s dormdir=%d",
-               group, signum, pids, taskFile, dormdir);
- 
-+    if ((controller = virCgroupGetAnyController(group)) < 0)
-+        return -1;
-+
-     if (virCgroupPathOfController(group, controller, "", &keypath) < 0)
-         return -1;
- 
-@@ -2760,7 +2781,7 @@ virCgroupKillRecursiveInternal(virCgroup *group,
-             return -1;
- 
-         if ((rc = virCgroupKillRecursiveInternal(subgroup, signum, pids,
--                                                 controller, taskFile, true)) 
< 0)
-+                                                 taskFile, true)) < 0)
-             return -1;
-         if (rc == 1)
-             killedAny = true;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 00193fb101..caf7ed84db 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -135,6 +135,5 @@ int virCgroupRemoveRecursively(char *grppath);
- int virCgroupKillRecursiveInternal(virCgroup *group,
-                                    int signum,
-                                    GHashTable *pids,
--                                   int controller,
-                                    const char *taskFile,
-                                    bool dormdir);
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 2cc7dd386a..8a04bb2e4a 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -812,12 +812,7 @@ virCgroupV1KillRecursive(virCgroup *group,
-                          int signum,
-                          GHashTable *pids)
- {
--    int controller = virCgroupV1GetAnyController(group);
--
--    if (controller < 0)
--        return -1;
--
--    return virCgroupKillRecursiveInternal(group, signum, pids, controller,
-+    return virCgroupKillRecursiveInternal(group, signum, pids,
-                                           "tasks", false);
- }
- 
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e555217355..8881d3a88a 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -577,12 +577,7 @@ virCgroupV2KillRecursive(virCgroup *group,
-                          int signum,
-                          GHashTable *pids)
- {
--    int controller = virCgroupV2GetAnyController(group);
--
--    if (controller < 0)
--        return -1;
--
--    return virCgroupKillRecursiveInternal(group, signum, pids, controller,
-+    return virCgroupKillRecursiveInternal(group, signum, pids,
-                                           "cgroup.threads", false);
- }
- 
--- 
-2.26.3
-

diff --git a/app-emulation/libvirt/libvirt-7.0.0-r4.ebuild 
b/app-emulation/libvirt/libvirt-7.0.0-r4.ebuild
deleted file mode 100644
index 836c4a3cbf43..000000000000
--- a/app-emulation/libvirt/libvirt-7.0.0-r4.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson bash-completion-r1 eutils 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";
-       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/";
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-       apparmor audit +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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-1.5.0
-               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-3.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.6.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-doc-path.patch
-       "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch
-       "${FILESDIR}"/${PN}-7.0.0-fix_virtproxyd_unit_file.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"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       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 .
-
-       # 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_use 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"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       meson_src_test
-}
-
-src_install() {
-       meson_src_install
-
-       # Remove bogus, empty directories. They are either not used, or
-       # libvirtd is able to create them on demand
-       rm -rf "${D}"/etc/sysconfig || die
-       rm -rf "${D}"/var || die
-       rm -rf "${D}"/run || die
-
-       # Fix up doc paths for revisions
-       if [ ${PV} != ${PVR} ]; then
-               mv "${ED}"/usr/share/doc/${PN}-${PV}/* 
"${ED}"/usr/share/doc/${PF} || die
-               rmdir "${ED}"/usr/share/doc/${PN}-${PV} || die
-       fi
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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_preinst() {
-       # we only ever want to generate this once
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               rm -rf "${ED}"/etc/libvirt/qemu/networks/default.xml || die
-       fi
-}
-
-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-7.1.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-7.1.0-r2.ebuild
deleted file mode 100644
index db10dd1e093e..000000000000
--- a/app-emulation/libvirt/libvirt-7.1.0-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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";
-       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 +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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-1.5.0
-               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-3.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.6.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-doc-path.patch
-       "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.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 .
-
-       # 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_use 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"
-       )
-
-       meson_src_configure
-}
-
-src_test() {
-       export VIR_TEST_DEBUG=1
-       meson_src_test
-}
-
-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
-
-       # Fix up doc paths for revisions
-       if [[ ${PV} != ${PVR} ]]; then
-               mv "${ED}"/usr/share/doc/${PN}-${PV}/* 
"${ED}"/usr/share/doc/${PF} || die
-               rmdir "${ED}"/usr/share/doc/${PN}-${PV} || die
-       fi
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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-7.2.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-7.2.0-r2.ebuild
deleted file mode 100644
index 45900edb680d..000000000000
--- a/app-emulation/libvirt/libvirt-7.2.0-r2.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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";
-       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 +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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-1.5.0
-               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-3.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.6.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.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.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 .
-
-       # 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_use 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
-       meson_src_test
-}
-
-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
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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-7.3.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-7.3.0-r1.ebuild
deleted file mode 100644
index 249a5159a880..000000000000
--- a/app-emulation/libvirt/libvirt-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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";
-       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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-3.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.6.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
-)
-
-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 .
-
-       # 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_use 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
-       meson_src_test
-}
-
-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-7.4.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-7.4.0-r1.ebuild
deleted file mode 100644
index 2db147e24487..000000000000
--- a/app-emulation/libvirt/libvirt-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-3.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.6.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
-)
-
-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 .
-
-       # 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_use 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
-       meson_src_test
-}
-
-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-7.5.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-7.5.0-r1.ebuild
deleted file mode 100644
index 445b5134a13b..000000000000
--- a/app-emulation/libvirt/libvirt-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-3.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 )"
-
-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
-)
-
-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 .
-
-       # 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
-       meson_src_test
-}
-
-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-7.8.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-7.8.0-r1.ebuild
deleted file mode 100644
index f881f1398b3c..000000000000
--- a/app-emulation/libvirt/libvirt-7.8.0-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2021 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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-3.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 )"
-
-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
-)
-
-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-7.9.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-7.9.0-r2.ebuild
deleted file mode 100644
index df3e41ce870c..000000000000
--- a/app-emulation/libvirt/libvirt-7.9.0-r2.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2021 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
-       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-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       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-3.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 )"
-
-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
-)
-
-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
-}

Reply via email to