[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/

["Sam James" <sam@gentoo.org>]

commit:     d633e27e825b7354a60db8a89bd68367bf485826
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 10:27:31 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 10:27:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d633e27e

app-emulation/libvirt: drop 9.3.0-r2, 9.4.0-r5, 9.5.0-r2, 9.6.0-r1

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

 app-emulation/libvirt/Manifest                     |   8 -
 ...virt-6.0.0-fix_paths_in_libvirt-guests_sh.patch |  35 --
 .../files/libvirt-8.2.0-do-not-use-sysconfig.patch | 211 ------------
 .../libvirt-8.2.0-fix-paths-for-apparmor.patch     |  68 ----
 app-emulation/libvirt/libvirt-9.3.0-r2.ebuild      | 363 --------------------
 app-emulation/libvirt/libvirt-9.4.0-r5.ebuild      | 365 ---------------------
 app-emulation/libvirt/libvirt-9.5.0-r2.ebuild      | 365 ---------------------
 app-emulation/libvirt/libvirt-9.6.0-r1.ebuild      | 364 --------------------
 8 files changed, 1779 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index b15001d91504..4c3b97bfe41f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,13 +1,5 @@
 DIST libvirt-10.0.0.tar.xz 9395076 BLAKE2B bfbea7805a949999481293a31e52a5511bcf86db2c96486cbc3b9cb776719ec973b1208cfcb4a8ae2c9220d1d68053980eaf68893f7919c3ef354efbd1abf642 SHA512 4ab28539ff0e9a78ac231b11b4ec88b91d76ff2607cabd0226f04aaece73b05cab4aa9cfcf05073cd257ea270a377cd5d2cb915971583dbec04dadf2cf7ad252
 DIST libvirt-10.0.0.tar.xz.asc 833 BLAKE2B e6377fe80a96025fe643d9bb14b3d64da3cf7f53000d8ee55606b4bc635d735943c4a7baa3796cbb7ce5812f03e2efd700aeef72e5bfcce68938b873aeca3f1f SHA512 08681d45c39695b07c88b27fddc471284ed66caa091a73ea3957e42ec92776d435ecb4dc71b6bb18a825322468fccb09263f612aa1bde53deea3d6c5305313d8
-DIST libvirt-9.3.0.tar.xz 9246292 BLAKE2B 6e47a70ec247b37c1958e324d5bf7ebcbff6aca5a7a9860f437ebe6a969d569a449d3dd5720081ad27926f445bcbe10089cb3b1d27960decc6239306f82259f9 SHA512 b9349dcd7798c76d75bb20afad67d6e676758cb201acaf7aed5109f0e91422b2bcca964a2f19aa8dc4fd0eca2923902474e16e3839bf8b15aca827028e88ddb7
-DIST libvirt-9.3.0.tar.xz.asc 833 BLAKE2B 25810919210bd489ecfd85f172c472d52e911e90d651fac2c7fa4f73220890bd2448317448f0469e8abfe8ad5ea6f3eb6b321e6d989e64f6ad4b676a5a38312c SHA512 0b51a621cef616ac55ac40c9bf9da56d3e1d59b5e87bcd04deaac7f775faab8f30861e53112be2242d9c8c6be41f1ed1c29d345d96e39be0ac33ef0b01494c45
-DIST libvirt-9.4.0.tar.xz 9250724 BLAKE2B 837a6eef509a43a0cd25a2ecaac9de95f21e903b553d5e56b404a689495e66bb0053866c9aea672cbe69130286d5a2ff2eb38ff447c77100e92bcb56cd244ee3 SHA512 8a8e3983c47c5ed5f4b50d90cb04e435717afddd27e16112ceeddda458d45c693daf65575f5d50274cfffcd1c83cbdd290819d8ece63f3bf9441b6bdaa309852
-DIST libvirt-9.4.0.tar.xz.asc 833 BLAKE2B 3a31f4097d8684a3a5e4b696c9bb49316a07c611a0cf1703e18653536af93d018ec44cbe5d0ce031e6f2c23a7c72691ded4c219faafa4bc770ad0dd7b616d0ce SHA512 710861b6b1c866be452e2da18a631076ad3ca3fbeb1728e561de08b34d16d2b49a0c390e7fa36eb35d0dc58fa35d5866ea6c573c84e9312b02880cdb969f7342
-DIST libvirt-9.5.0.tar.xz 9261176 BLAKE2B 9c270f782bb74194f209251d6397537182949e97877238bd96b36256b14000998d7b8ad2d4bccad5b44c54a69a21b0be6f60665b3f3bab5cd129e4cfce39a264 SHA512 d8c40281856a60ba2a22a7a64721c4baee1803235227a973a22465aacfb26f674dc65045b87d0dcd183be324cb65408f253b4d72c2ed494fb809e98772eea2e3
-DIST libvirt-9.5.0.tar.xz.asc 833 BLAKE2B 48e935f3509b05403a742119657983f4708a26637af1ec6b622ff82ae5d2507ff935cdf113ade37b643b2bca49ad56bfd1eba7809349a17634e4779d25edbd96 SHA512 794e7be683e61da963b96ac6185e4abb65a44578e00fa14073a0d6c7d98973c4fa5038a0a905f822a6d2f8fd1b201145714b0137adf936c6d56df79523a08b9e
-DIST libvirt-9.6.0.tar.xz 9282400 BLAKE2B a58f2dea7a3051bb7a69678bd1e1dac9123892b2ca7ee6b204bda1a0a3c8fd2d210b2295b300bb88fab86dfddb3d7472d495ff4c10af84bb53b7662190cf17c4 SHA512 654d22cc71926715e103313f01a4f117a19dfcf3087ffe714cf2114dbc88e42ac33cc6c100c61e60f76f13468ff5f369b157748ca6cd69c4d504d4de6b6e44b4
-DIST libvirt-9.6.0.tar.xz.asc 833 BLAKE2B c8eb984dfb797dad5c09a1aea28b835f43f14ee560548df5d3514efab14b0c4df37c964caa6ec092751a804f998d48b89cdddb03172a6d19de82b649774212b5 SHA512 8f1cb80ecddeaed137c2a381be9c324a08aa661d629c56667ef0080b140000f288ce33491c3ebdd286f490b6935ce460cb4dd7b5ec694f4636d6fff2d621ca88
 DIST libvirt-9.8.0.tar.xz 9307064 BLAKE2B aae47e8d4eeaf97532a0356de23ed5a9eea71b369d025eda95b5fd74576779eb4b843d05df6c87b79a14f218c341953749e319ee7244846a2db410a74a746880 SHA512 0118725073de33eec3fa3e4616d3154707f9828fdb9ec973f503fe68f18eab72b9704da660f281152630ddc95e605c786673af9d23dc9bdfc0108422e0efbd41
 DIST libvirt-9.8.0.tar.xz.asc 833 BLAKE2B 3ecd0a925992eeadd50675f7ad8e815bde532c0f66e331ea766fff8e613b6a60b002bedee82fd03684e703057bc13d4e92191268dcd5efe2611ce9bd3cf6b505 SHA512 e041db13281eae9323c22189b7a258caf8d0e2a350cbd31b6cbed7054ccaf09d05c155c3c09daea07940affdf15e8d42bb2339945480cd141a6e8cb417a78536
 DIST libvirt-9.9.0.tar.xz 9321556 BLAKE2B 21eae5a95feaf7f5c6ba8dd48732c08212904882a11c48eccfa827d85ddc3df7e064503f21710dbe1b678670e02f003674de915a43a7403fbf85685c4832e21d SHA512 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7

diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
deleted file mode 100644
index bf7a328f7759..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001
-Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com>
-In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
-References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 31 Jan 2020 09:42:14 +0100
-Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- tools/libvirt-guests.sh.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index a881f6266e..79d38b3e9a 100644
---- a/tools/libvirt-guests.sh.in
-+++ b/tools/libvirt-guests.sh.in
-@@ -39,11 +39,11 @@ START_DELAY=0
- BYPASS_CACHE=0
- SYNC_TIME=0
- 
--test -f "$sysconfdir"/sysconfig/libvirt-guests &&
--    . "$sysconfdir"/sysconfig/libvirt-guests
-+test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
-+    . "$sysconfdir"/libvirt/libvirt-guests.conf
- 
- LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
--VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
-+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
- 
- RETVAL=0
- 
--- 
-2.24.1
-

diff --git a/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch
deleted file mode 100644
index fae61294584e..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-From 10d65f10a76c7478c4ec0c65ffeec7f4b18929f9 Mon Sep 17 00:00:00 2001
-Message-Id: <10d65f10a76c7478c4ec0c65ffeec7f4b18929f9.1646212419.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 2 Mar 2022 10:01:04 +0100
-Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/interface/virtinterfaced.service.in | 1 -
- src/libxl/virtxend.service.in           | 1 -
- src/locking/virtlockd.service.in        | 1 -
- src/logging/virtlogd.service.in         | 3 +--
- src/lxc/virtlxcd.service.in             | 1 -
- src/network/virtnetworkd.service.in     | 1 -
- src/node_device/virtnodedevd.service.in | 1 -
- src/nwfilter/virtnwfilterd.service.in   | 1 -
- src/qemu/virtqemud.service.in           | 1 -
- src/remote/libvirtd.service.in          | 1 -
- src/remote/virtproxyd.service.in        | 1 -
- src/secret/virtsecretd.service.in       | 1 -
- src/storage/virtstoraged.service.in     | 1 -
- src/vbox/virtvboxd.service.in           | 1 -
- tools/libvirt-guests.service.in         | 2 +-
- 15 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
-index cb860ff1c4..090b198ac7 100644
---- a/src/interface/virtinterfaced.service.in
-+++ b/src/interface/virtinterfaced.service.in
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTINTERFACED_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
- ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
-index 6b083c414f..597f5d1905 100644
---- a/src/libxl/virtxend.service.in
-+++ b/src/libxl/virtxend.service.in
-@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities
- [Service]
- Type=notify
- Environment=VIRTXEND_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
- ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 19271d1e7d..87193952cb 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -8,7 +8,6 @@ Documentation=https://libvirt.org
- 
- [Service]
- Environment=VIRTLOCKD_ARGS=
--EnvironmentFile=-@sysconfdir@/sysconfig/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 8ab5478517..fe5c58b8ed 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
-+ExecStart=@sbindir@/virtlogd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Losing the logs is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
-diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
-index 334c34db44..1b9689017e 100644
---- a/src/lxc/virtlxcd.service.in
-+++ b/src/lxc/virtlxcd.service.in
-@@ -19,7 +19,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTLXCD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
- ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
-index 05ce672b73..ee4cd9bca1 100644
---- a/src/network/virtnetworkd.service.in
-+++ b/src/network/virtnetworkd.service.in
-@@ -17,7 +17,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTNETWORKD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
- ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in
-index cd9de362fd..7693aa52c4 100644
---- a/src/node_device/virtnodedevd.service.in
-+++ b/src/node_device/virtnodedevd.service.in
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTNODEDEVD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
- ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
-index ab65419e0c..16d8b377b0 100644
---- a/src/nwfilter/virtnwfilterd.service.in
-+++ b/src/nwfilter/virtnwfilterd.service.in
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTNWFILTERD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
- ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
-index 5ad968ace9..c63147d31f 100644
---- a/src/qemu/virtqemud.service.in
-+++ b/src/qemu/virtqemud.service.in
-@@ -21,7 +21,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTQEMUD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
- ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 5d4d412fcc..27cfc34b90 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -29,7 +29,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=LIBVIRTD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
- ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
-index f9bb6b84a9..0eddf5ee93 100644
---- a/src/remote/virtproxyd.service.in
-+++ b/src/remote/virtproxyd.service.in
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTPROXYD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
- ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
-index 6d298c5334..92e54f175f 100644
---- a/src/secret/virtsecretd.service.in
-+++ b/src/secret/virtsecretd.service.in
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTSECRETD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
- ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
-index eda4d86d37..abe91e3d80 100644
---- a/src/storage/virtstoraged.service.in
-+++ b/src/storage/virtstoraged.service.in
-@@ -16,7 +16,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTSTORAGED_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
- ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
-index 6f447276e9..54fbd0be4a 100644
---- a/src/vbox/virtvboxd.service.in
-+++ b/src/vbox/virtvboxd.service.in
-@@ -15,7 +15,6 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=VIRTVBOXD_ARGS="--timeout 120"
--EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
- ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index 3cf6476196..5668009ae4 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -20,7 +20,7 @@ Documentation=man:libvirt-guests(8)
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/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.34.1
-

diff --git a/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch
deleted file mode 100644
index 544eb944f9e7..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 52ecc3247d72e2a5ffc390093d803f59e20087f6 Mon Sep 17 00:00:00 2001
-Message-Id: <52ecc3247d72e2a5ffc390093d803f59e20087f6.1647318231.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 15 Mar 2022 05:23:29 +0100
-Subject: [PATCH] libvirt-8.2.0-fix-paths-for-apparmor.patch
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
-diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
-index 44056b5f14..1f0db2cda2 100644
---- a/src/security/apparmor/libvirt-qemu
-+++ b/src/security/apparmor/libvirt-qemu
-@@ -96,6 +96,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 58b4024b85..c77b32665d 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',
-@@ -35,7 +35,7 @@ install_data(
- )
- 
- 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',
- )
-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 ff1d46bebe..6beedde1b1 100644
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-@@ -41,7 +41,7 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
-   deny /dev/mapper/* r,
- 
-   @libexecdir@/virt-aa-helper mr,
--  /{usr/,}sbin/apparmor_parser Ux,
-+  /{usr/,}{s,}bin/apparmor_parser Ux,
- 
-   @sysconfdir@/apparmor.d/libvirt/* r,
-   @sysconfdir@/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
-@@ -71,5 +71,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
-   /**.[iI][sS][oO] r,
-   /**/disk{,.*} r,
- 
--  #include <local/usr.lib.libvirt.virt-aa-helper>
-+  #include <local/usr.libexec.libvirt.virt-aa-helper>
- }
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-similarity index 100%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local

diff --git a/app-emulation/libvirt/libvirt-9.3.0-r2.ebuild b/app-emulation/libvirt/libvirt-9.3.0-r2.ebuild
deleted file mode 100644
index 82fda1d2cf06..000000000000
--- a/app-emulation/libvirt/libvirt-9.3.0-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2024 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..11} )
-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://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-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(-)] )
-	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
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.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
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature 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)
-
-		-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"
-		-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-9.4.0-r5.ebuild b/app-emulation/libvirt/libvirt-9.4.0-r5.ebuild
deleted file mode 100644
index 5df9ca970adb..000000000000
--- a/app-emulation/libvirt/libvirt-9.4.0-r5.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2024 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..11} )
-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://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-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(-)] )
-	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/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.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
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature 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)
-
-		-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}"
-	)
-
-	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-9.5.0-r2.ebuild b/app-emulation/libvirt/libvirt-9.5.0-r2.ebuild
deleted file mode 100644
index 51178c2f3795..000000000000
--- a/app-emulation/libvirt/libvirt-9.5.0-r2.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2024 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..11} )
-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://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-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(-)] )
-	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/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.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
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature 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)
-
-		-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}"
-	)
-
-	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-9.6.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.6.0-r1.ebuild
deleted file mode 100644
index bb1560fb0ec5..000000000000
--- a/app-emulation/libvirt/libvirt-9.6.0-r1.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2024 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..11} )
-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://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-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(-)] )
-	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/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.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
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature 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)
-
-		-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}"
-	)
-
-	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
-}