commit:     f2540e104f8400fa56e1d2c249125f69e33901eb
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Tue Oct 14 15:57:45 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 09:13:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2540e10

app-emulation/libvirt: Drop 11.1.0-r1, 11.1.0-r2, 11.2.0-r2 and 11.4.0-r1

There most recent stable version is 11.6.0-r1, drop the old ones.

Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44234
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/libvirt/Manifest                     |   6 -
 .../libvirt-10.7.0-fix-paths-for-apparmor.patch    |  88 -----
 ...-match_firwmare_with_fully_resolved_paths.patch |  70 ----
 .../files/libvirt-9.9.0-do-not-use-sysconfig.patch |  79 -----
 app-emulation/libvirt/libvirt-11.1.0-r1.ebuild     | 380 --------------------
 app-emulation/libvirt/libvirt-11.1.0-r2.ebuild     | 381 ---------------------
 app-emulation/libvirt/libvirt-11.2.0-r2.ebuild     | 381 ---------------------
 app-emulation/libvirt/libvirt-11.4.0-r1.ebuild     | 381 ---------------------
 8 files changed, 1766 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 21a5e6d0518a..3d9d38afff5e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,8 +1,2 @@
-DIST libvirt-11.1.0.tar.xz 9775904 BLAKE2B 
81ce8d537d6d069d44b3e24f2091729acd8b04ceea14e5c56188cffa300015aa5215fa64324718cede93d1bf84ae5409936bf7f6c8505b071b8dcc47094da78c
 SHA512 
f491b3c0b0e4b6a96456eba26d72e820141c231fa44f34f2d153b805b046ca869b5d0286cd7e2867ae938e5eab5e04f2995c097d41227914bc87a76800e89bc8
-DIST libvirt-11.1.0.tar.xz.asc 833 BLAKE2B 
c1d580c77a336eb83fcc47fd12e0595952612cdb6765adb7c1bb8708457642799833fb7082410198ccf9f22c82714ec0cb288045e0ad4fefdff219b259815b15
 SHA512 
914237e6341f6df60f407d5e47d4ae1193a75fee905d9faa4a439eda421e446c84909d08b21927b41e0972c90c0eeecb4821fefefcf454872e2887ce91344be3
-DIST libvirt-11.2.0.tar.xz 9766976 BLAKE2B 
dc6288c2e61ab2730a8fa907b52061abb5bd3ca2ab28aa6e1e4142ddc00e9f0f4747240cae7dffed87c88fb4c14913a12f1fb3bad6d4079785e397ff78e2cc4c
 SHA512 
78fdc0e7cc09687eb9fdb3d43ceab63018fb06d931669e4a461ddb2612a2367d885f59de14b7770ff164e5a30e487a0dc8c8bdcc778a14c4cf37e0e7db162792
-DIST libvirt-11.2.0.tar.xz.asc 833 BLAKE2B 
2047fc9dcadfd57fda7d7fd02456127213715d514135d5a0a55b077270c93f418da9ecea57dbc7b44d8c57d7fe373411a8e27975669c94d059b8916b0237f048
 SHA512 
59e88826cc2d78ccaf18ff637afd279c470e026836b9ad08c35e3226e7d6d02a4dcd375d037454572b21bf029e3b3ec9f577a48e219c54137ecfaa2adc938c6c
-DIST libvirt-11.4.0.tar.xz 9849020 BLAKE2B 
54d2b9cb35394184d2ce22670623849ecfb54abd1c8e48135ec735ed6b30fa9fa22261cf847a66269a0f3918f164954fcc0a5d7eec1e0d759831925f3ac6b546
 SHA512 
88888b0cf80c1c4350a834d9f462c030235878a57d8723ca13775872cc8d4034c8360536513d8117ab542fd045287f3af0e3f2b70ae26f3af6acaaf3fc3f4c01
-DIST libvirt-11.4.0.tar.xz.asc 833 BLAKE2B 
5a778957aea67264c48cdb61ed993127be7a2f2b78d993035d75bb5d7a2bb8e1e42ef0c4f4f06861bb60c3a025b262462f3c325fca1a9d5ff7e913fe28f66e76
 SHA512 
8b12c3f63ef25ebe99e7892ca2512e5a6d1b3ae0806c18341e65e4cde747f101781bad499ab106feb07d20cde6ce3a1eb15e8e53bb1200829752ee4b4f9dc308
 DIST libvirt-11.6.0.tar.xz 9960064 BLAKE2B 
d0b118fa0086ecaae9fbe03fb743cd30b9b953101ee0f746867402d588ba6b5ebf19960cc2303b3630a57bc336d5187de1156d007bb1d7084e756ac0a7050af9
 SHA512 
b3dcc6628a53e9d8522965c1c47619caf00cbbcfe058298c0162ca196434c96935b1de8e6b8ced8b99737ad12c90e60a969cf83ed6f4ff61e77959ae28e6e6f7
 DIST libvirt-11.6.0.tar.xz.asc 833 BLAKE2B 
8a6ed45232ff4a4cef1a7b795118b7aee41941d9af73635b104ad9445e6d094b0c0a87c8e1ad461e7934be93a0104809df18d48967583e7c8d72d5ede32ba649
 SHA512 
f97c3165a275dece9a1d1628832de5f522ff0de0d6b8da0e672873df36c33a95edf262e7a80630f1beb9460ac32ef8606e12e29fb4338a04e730f3b648216f90

diff --git 
a/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch 
b/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch
deleted file mode 100644
index 082be4bd1721..000000000000
--- a/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 9e543b61227ce4e34f02bb54db226f2284c6e359 Mon Sep 17 00:00:00 2001
-Message-ID: 
<9e543b61227ce4e34f02bb54db226f2284c6e359.1726482829.git.mpriv...@redhat.com>
-From: Michal Privoznik <[email protected]>
-Date: Tue, 15 Mar 2022 05:23:29 +0100
-Subject: [PATCH] libvirt-10.7.0-fix-paths-for-apparmor.patch
-
-Signed-off-by: Michal Privoznik <[email protected]>
----
- src/security/apparmor/libvirt-qemu.in                       | 1 +
- src/security/apparmor/meson.build                           | 6 +++---
- src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local  | 1 -
- ...t-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 4 ++--
- .../apparmor/usr.libexec.libvirt.virt-aa-helper.local       | 1 +
- 5 files changed, 7 insertions(+), 6 deletions(-)
- delete mode 100644 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
- rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper.in => 
usr.libexec.libvirt.virt-aa-helper.in} (94%)
- create mode 100644 
src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-
-diff --git a/src/security/apparmor/libvirt-qemu.in 
b/src/security/apparmor/libvirt-qemu.in
-index 8f17256554..fc9df7ee34 100644
---- a/src/security/apparmor/libvirt-qemu.in
-+++ b/src/security/apparmor/libvirt-qemu.in
-@@ -97,6 +97,7 @@
-   /usr/share/sgabios/** r,
-   /usr/share/slof/** r,
-   /usr/share/vgabios/** r,
-+  /usr/share/seavgabios/** r,
- 
-   # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
-   /etc/pki/CA/ r,
-diff --git a/src/security/apparmor/meson.build 
b/src/security/apparmor/meson.build
-index b9257c816d..c1b79fef27 100644
---- a/src/security/apparmor/meson.build
-+++ b/src/security/apparmor/meson.build
-@@ -1,5 +1,5 @@
- apparmor_gen_profiles = [
--  'usr.lib.libvirt.virt-aa-helper',
-+  'usr.libexec.libvirt.virt-aa-helper',
-   'usr.sbin.libvirtd',
-   'usr.sbin.virtqemud',
-   'usr.sbin.virtxend',
-@@ -82,8 +82,8 @@ if not conf.has('WITH_APPARMOR_3')
-   # AppArmor 3.x, upstream's preference is to avoid creating these
-   # files in order to limit the amount of filesystem clutter.
-   install_data(
--    'usr.lib.libvirt.virt-aa-helper.local',
-+    'usr.libexec.libvirt.virt-aa-helper.local',
-     install_dir: apparmor_dir / 'local',
--    rename: 'usr.lib.libvirt.virt-aa-helper',
-+    rename: 'usr.libexec.libvirt.virt-aa-helper',
-   )
- endif
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local 
b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
-deleted file mode 100644
-index c0990e51d0..0000000000
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
-+++ /dev/null
-@@ -1 +0,0 @@
--# Site-specific additions and overrides for 'usr.lib.libvirt.virt-aa-helper'
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in 
b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-similarity index 94%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-index 44645c6989..38fd3bfb88 100644
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-@@ -72,9 +72,9 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
-   /**/disk{,.*} r,
- 
- @BEGIN_APPARMOR_3@
--  include if exists <local/usr.lib.libvirt.virt-aa-helper>
-+  include if exists <local/usr.libexec.libvirt.virt-aa-helper>
- @END_APPARMOR_3@
- @BEGIN_APPARMOR_2@
--  #include <local/usr.lib.libvirt.virt-aa-helper>
-+  #include <local/usr.libexec.libvirt.virt-aa-helper>
- @END_APPARMOR_2@
- }
-diff --git a/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local 
b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-new file mode 100644
-index 0000000000..974653d797
---- /dev/null
-+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-@@ -0,0 +1 @@
-+# Site-specific additions and overrides for 
'usr.libexec.libvirt.virt-aa-helper'
--- 
-2.44.2
-

diff --git 
a/app-emulation/libvirt/files/libvirt-11.1.0-match_firwmare_with_fully_resolved_paths.patch
 
b/app-emulation/libvirt/files/libvirt-11.1.0-match_firwmare_with_fully_resolved_paths.patch
deleted file mode 100644
index 9ee6ce563702..000000000000
--- 
a/app-emulation/libvirt/files/libvirt-11.1.0-match_firwmare_with_fully_resolved_paths.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream: https://gitlab.com/libvirt/libvirt/-/merge_requests/498
-Gentoo-Bug: https://bugs.gentoo.org/960591
-
-diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
-index 
2d0ec0b4fa228a0bdf996a4301b203f593a28ee0..b13b4f9abb1a0334c6f04a42d5373b8518eeb59c
 100644
---- a/src/qemu/qemu_firmware.c
-+++ b/src/qemu/qemu_firmware.c
-@@ -33,6 +33,7 @@
- #include "viralloc.h"
- #include "virenum.h"
- #include "virstring.h"
-+#include "virfile.h"
- 
- #define VIR_FROM_THIS VIR_FROM_QEMU
- 
-@@ -937,23 +938,23 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw,
-     switch (fw->mapping.device) {
-     case QEMU_FIRMWARE_DEVICE_FLASH:
-         if (loader && loader->path &&
--            STRNEQ(loader->path, flash->executable.filename))
-+            !virFileComparePaths(loader->path, flash->executable.filename))
-             return false;
-         if (loader && loader->nvramTemplate) {
-             if (flash->mode != QEMU_FIRMWARE_FLASH_MODE_SPLIT)
-                 return false;
--            if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filename))
-+            if (!virFileComparePaths(loader->nvramTemplate, 
flash->nvram_template.filename))
-                 return false;
-         }
-         break;
-     case QEMU_FIRMWARE_DEVICE_MEMORY:
-         if (loader && loader->path &&
--            STRNEQ(loader->path, memory->filename))
-+            !virFileComparePaths(loader->path, memory->filename))
-             return false;
-         break;
-     case QEMU_FIRMWARE_DEVICE_KERNEL:
-         if (kernelPath &&
--            STRNEQ(kernelPath, kernel->filename))
-+            !virFileComparePaths(kernelPath, kernel->filename))
-             return false;
-         break;
-     case QEMU_FIRMWARE_DEVICE_NONE:
-@@ -1657,7 +1658,7 @@ qemuFirmwareFillDomainLegacy(virQEMUDriver *driver,
-     for (i = 0; i < cfg->nfirmwares; i++) {
-         virFirmware *fw = cfg->firmwares[i];
- 
--        if (STRNEQ(fw->name, loader->path)) {
-+        if (!virFileComparePaths(fw->name, loader->path)) {
-             VIR_DEBUG("Not matching loader path '%s' for user provided path 
'%s'",
-                       fw->name, loader->path);
-             continue;
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 
3b7a795d459addfe2401f833ff0f409d3013f8bd..a5c9fbe0d92408996f23413327a9dbd323a97474
 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -4108,11 +4108,11 @@ virFileComparePaths(const char *p1, const char *p2)
-      * 'sysfs', since they're no real paths so fallback to plain string
-      * comparison.
-      */
--    ignore_value(virFileResolveLink(p1, &res1));
-+    ignore_value(virFileResolveAllLinks(p1, &res1));
-     if (!res1)
-         res1 = g_strdup(p1);
- 
--    ignore_value(virFileResolveLink(p2, &res2));
-+    ignore_value(virFileResolveAllLinks(p2, &res2));
-     if (!res2)
-         res2 = g_strdup(p2);
- 

diff --git 
a/app-emulation/libvirt/files/libvirt-9.9.0-do-not-use-sysconfig.patch 
b/app-emulation/libvirt/files/libvirt-9.9.0-do-not-use-sysconfig.patch
deleted file mode 100644
index debca8c80146..000000000000
--- a/app-emulation/libvirt/files/libvirt-9.9.0-do-not-use-sysconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From bdc0f6b9c91615c601ea3a625220097f5cb0eeb0 Mon Sep 17 00:00:00 2001
-Message-ID: 
<bdc0f6b9c91615c601ea3a625220097f5cb0eeb0.1696413637.git.mpriv...@redhat.com>
-From: Michal Privoznik <[email protected]>
-Date: Wed, 2 Mar 2022 10:01:04 +0100
-Subject: [PATCH] libvirt-9.9.0-do-not-use-sysconfig.patch
-
-Signed-off-by: Michal Privoznik <[email protected]>
----
- src/locking/virtlockd.service.in | 1 -
- src/logging/virtlogd.service.in  | 1 -
- src/remote/libvirtd.service.in   | 1 -
- src/virtd.service.in             | 1 -
- tools/libvirt-guests.service.in  | 2 +-
- 5 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/locking/virtlockd.service.in 
b/src/locking/virtlockd.service.in
-index ce00b6def9..9dee9189db 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -10,7 +10,6 @@ After=virtlockd-admin.socket
- [Service]
- Type=notify
- Environment=VIRTLOCKD_ARGS=
--EnvironmentFile=-@initconfdir@/virtlockd
- ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
- ExecReload=/bin/kill -USR1 $MAINPID
- # Losing the locks is a really bad thing that will
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index 52c9e5bb9e..90c63f0483 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -10,7 +10,6 @@ After=virtlogd-admin.socket
- [Service]
- Type=notify
- Environment=VIRTLOGD_ARGS=
--EnvironmentFile=-@initconfdir@/virtlogd
- ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
- ExecReload=/bin/kill -USR1 $MAINPID
- # Losing the logs is a really bad thing that will
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 24a6712b75..e4b4a189e1 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -28,7 +28,6 @@ Conflicts=xendomains.service
- [Service]
- Type=notify
- Environment=LIBVIRTD_ARGS="--timeout 120"
--EnvironmentFile=-@initconfdir@/libvirtd
- ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-diff --git a/src/virtd.service.in b/src/virtd.service.in
-index 651a8d82d7..b87c7e0553 100644
---- a/src/virtd.service.in
-+++ b/src/virtd.service.in
-@@ -17,7 +17,6 @@ After=apparmor.service
- [Service]
- Type=notify
- Environment=@SERVICE@_ARGS="--timeout 120"
--EnvironmentFile=-@initconfdir@/@service@
- ExecStart=@sbindir@/@service@ $@SERVICE@_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index c547218f2a..f5a1a60abe 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@initconfdir@/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
--- 
-2.41.0
-

diff --git a/app-emulation/libvirt/libvirt-11.1.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-11.1.0-r1.ebuild
deleted file mode 100644
index 03f2148c76ab..000000000000
--- a/app-emulation/libvirt/libvirt-11.1.0-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://download.libvirt.org/${P}.tar.xz
-               verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
-       KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-       parted pcap policykit +qemu rbd sasl selinux test +udev
-       virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc qemu virtualbox xen ) )
-       lxc? ( caps 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.66.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1:=
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-debug/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.8.1:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nbd? (
-               sys-block/nbdkit
-               sys-libs/libnbd
-       )
-       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[lvm]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-4.2
-               app-crypt/swtpm
-               dev-libs/json-c:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               || (
-                       >=net-firewall/iptables-1.4.10[ipv6(+)]
-                       net-firewall/nftables
-               )
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtiofsd? ( app-emulation/virtiofsd )
-       virtualbox? ( <app-emulation/virtualbox-7.1.0 )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-       ${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-               ')
-       )
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-       qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch
-       "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch
-)
-
-python_check_deps() {
-       if use test; then
-               python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-       fi
-}
-
-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"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~NETFILTER_XT_TARGET_MASQUERADE
-               ~NET_ACT_CSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nbd nbdkit)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu json_c)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature test tests)
-               $(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)
-
-               -Ddriver_openvz=disabled
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-               -Dopenwsman=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"
-               -Dinitconfdir="${EPREFIX}/etc/systemd"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # Workaround for bug #938302
-       if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" 
; then
-               local native_file="${T}"/meson.${CHOST}.ini.local
-               cat >> ${native_file} <<-EOF || die
-               [binaries]
-               dtrace='stap-dtrace'
-               EOF
-               emesonargs+=( --native-file "${native_file}" )
-       fi
-
-       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-11.1.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-11.1.0-r2.ebuild
deleted file mode 100644
index a7f5a81817e6..000000000000
--- a/app-emulation/libvirt/libvirt-11.1.0-r2.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://download.libvirt.org/${P}.tar.xz
-               verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-       parted pcap policykit +qemu rbd sasl selinux test +udev
-       virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc qemu virtualbox xen ) )
-       lxc? ( caps 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.66.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1:=
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-debug/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.8.1:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nbd? (
-               sys-block/nbdkit
-               sys-libs/libnbd
-       )
-       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[lvm]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-4.2
-               app-crypt/swtpm
-               dev-libs/json-c:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               || (
-                       >=net-firewall/iptables-1.4.10[ipv6(+)]
-                       net-firewall/nftables
-               )
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtiofsd? ( app-emulation/virtiofsd )
-       virtualbox? ( <app-emulation/virtualbox-7.1.0 )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-       ${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-               ')
-       )
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-       qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch
-       "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-11.1.0-match_firwmare_with_fully_resolved_paths.patch
-)
-
-python_check_deps() {
-       if use test; then
-               python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-       fi
-}
-
-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"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~NETFILTER_XT_TARGET_MASQUERADE
-               ~NET_ACT_CSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nbd nbdkit)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu json_c)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature test tests)
-               $(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)
-
-               -Ddriver_openvz=disabled
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-               -Dopenwsman=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"
-               -Dinitconfdir="${EPREFIX}/etc/systemd"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # Workaround for bug #938302
-       if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" 
; then
-               local native_file="${T}"/meson.${CHOST}.ini.local
-               cat >> ${native_file} <<-EOF || die
-               [binaries]
-               dtrace='stap-dtrace'
-               EOF
-               emesonargs+=( --native-file "${native_file}" )
-       fi
-
-       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-11.2.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-11.2.0-r2.ebuild
deleted file mode 100644
index 700d8e8cce25..000000000000
--- a/app-emulation/libvirt/libvirt-11.2.0-r2.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://download.libvirt.org/${P}.tar.xz
-               verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-       parted pcap policykit +qemu rbd sasl selinux test +udev
-       virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc qemu virtualbox xen ) )
-       lxc? ( caps 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.66.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1:=
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-debug/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.8.1:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nbd? (
-               sys-block/nbdkit
-               sys-libs/libnbd
-       )
-       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[lvm]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-4.2
-               app-crypt/swtpm
-               dev-libs/json-c:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               || (
-                       >=net-firewall/iptables-1.4.10[ipv6(+)]
-                       net-firewall/nftables
-               )
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtiofsd? ( app-emulation/virtiofsd )
-       virtualbox? ( <app-emulation/virtualbox-7.1.0 )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-       ${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-               ')
-       )
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-       qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch
-       "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-11.1.0-match_firwmare_with_fully_resolved_paths.patch
-)
-
-python_check_deps() {
-       if use test; then
-               python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-       fi
-}
-
-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"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~NETFILTER_XT_TARGET_MASQUERADE
-               ~NET_ACT_CSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nbd nbdkit)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu json_c)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature test tests)
-               $(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)
-
-               -Ddriver_openvz=disabled
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-               -Dopenwsman=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"
-               -Dinitconfdir="${EPREFIX}/etc/systemd"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # Workaround for bug #938302
-       if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" 
; then
-               local native_file="${T}"/meson.${CHOST}.ini.local
-               cat >> ${native_file} <<-EOF || die
-               [binaries]
-               dtrace='stap-dtrace'
-               EOF
-               emesonargs+=( --native-file "${native_file}" )
-       fi
-
-       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-11.4.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-11.4.0-r1.ebuild
deleted file mode 100644
index 870e15a6692f..000000000000
--- a/app-emulation/libvirt/libvirt-11.4.0-r1.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..14} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
-       EGIT_BRANCH="master"
-else
-       SRC_URI="https://download.libvirt.org/${P}.tar.xz
-               verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
-       KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/";
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-       apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-       iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-       parted pcap policykit +qemu rbd sasl selinux test +udev
-       virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc qemu virtualbox xen ) )
-       lxc? ( caps 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.66.0
-       dev-libs/libgcrypt
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.9.1:=
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-3.2.0:=
-       net-libs/libtirpc:=
-       >=net-misc/curl-7.18.0
-       sys-apps/dbus
-       sys-apps/dmidecode
-       sys-devel/gettext
-       >=sys-libs/readline-7.0:=
-       virtual/acl
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       dtrace? ( dev-debug/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( sys-fs/fuse:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( >=net-libs/libssh-0.8.1:= )
-       libssh2? ( >=net-libs/libssh2-1.3 )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-       lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-       nbd? (
-               sys-block/nbdkit
-               sys-libs/libnbd
-       )
-       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[lvm]
-       )
-       pcap? ( >=net-libs/libpcap-1.8.0 )
-       policykit? (
-               acct-group/libvirt
-               >=sys-auth/polkit-0.9
-       )
-       qemu? (
-               >=app-emulation/qemu-4.2
-               app-crypt/swtpm
-               dev-libs/json-c:=
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[dhcp,ipv6(+),script]
-               net-firewall/ebtables
-               || (
-                       >=net-firewall/iptables-1.4.10[ipv6(+)]
-                       net-firewall/nftables
-               )
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtiofsd? ( app-emulation/virtiofsd )
-       virtualbox? ( <app-emulation/virtualbox-7.1.0 )
-       wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-       xen? (
-               >=app-emulation/xen-4.9.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/libudev:=
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )
-       kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-       ${BDEPEND}
-       ${RDEPEND}
-       ${PYTHON_DEPS}
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-               ')
-       )
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-       qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch
-       "${FILESDIR}"/${PN}-11.3.0-do-not-use-sysconfig.patch
-       "${FILESDIR}"/${PN}-11.3.0-fix-paths-for-apparmor.patch
-       
"${FILESDIR}"/${PN}-11.1.0-match_firwmare_with_fully_resolved_paths.patch
-)
-
-python_check_deps() {
-       if use test; then
-               python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-       fi
-}
-
-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"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM
-               ~NETFILTER_XT_TARGET_MASQUERADE
-               ~NET_ACT_CSUM
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       touch "${S}/.mailmap" || die
-
-       default
-       python_fix_shebang .
-
-       # Skip fragile tests which relies on pristine environment
-       # (Breaks because of sandbox environment variables)
-       # bug #802876
-       sed -i -e "/commandtest/d" tests/meson.build || die
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-       local emesonargs=(
-               $(meson_feature apparmor)
-               $(meson_feature apparmor apparmor_profiles)
-               $(meson_feature audit)
-               $(meson_feature caps capng)
-               $(meson_feature dtrace)
-               $(meson_feature firewalld)
-               $(meson_feature fuse)
-               $(meson_feature glusterfs)
-               $(meson_feature glusterfs storage_gluster)
-               $(meson_feature iscsi storage_iscsi)
-               $(meson_feature iscsi-direct storage_iscsi_direct)
-               $(meson_feature libvirtd driver_libvirtd)
-               $(meson_feature libssh)
-               $(meson_feature libssh2)
-               $(meson_feature lvm storage_lvm)
-               $(meson_feature lvm storage_mpath)
-               $(meson_feature lxc driver_lxc)
-               $(meson_feature nbd nbdkit)
-               $(meson_feature nls)
-               $(meson_feature numa numactl)
-               $(meson_feature numa numad)
-               $(meson_feature parted storage_disk)
-               $(meson_feature pcap libpcap)
-               $(meson_feature policykit polkit)
-               $(meson_feature qemu driver_qemu)
-               $(meson_feature qemu json_c)
-               $(meson_feature rbd storage_rbd)
-               $(meson_feature sasl)
-               $(meson_feature selinux)
-               $(meson_feature test tests)
-               $(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)
-
-               -Ddriver_openvz=disabled
-               -Dnetcf=disabled
-               -Dsanlock=disabled
-               -Dopenwsman=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"
-               -Dinitconfdir="${EPREFIX}/etc/systemd"
-               -Drunstatedir="${EPREFIX}/run"
-               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # Workaround for bug #938302
-       if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" 
; then
-               local native_file="${T}"/meson.${CHOST}.ini.local
-               cat >> ${native_file} <<-EOF || die
-               [binaries]
-               dtrace='stap-dtrace'
-               EOF
-               emesonargs+=( --native-file "${native_file}" )
-       fi
-
-       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