15 files changed, 433 insertions, 98 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index dcd7d2943ba2..b98af1152c47 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index c91d18aba56c..4fb9cf1b5da6 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,3 @@
-DIST faudio-24.06.tar.gz 1125079 BLAKE2B 2664181d1fbed594b3f7af93877cb9f3ae1a9c34ed2e69d6307997e8b360045698d460912a1b689e060d9742fd002ce0370a6133dd944fa0b6e296949e679103 SHA512 d8fb3c2303c81163a26f437edce5ae428f4769a28107eb21f1fdb637421480928fc6f0031fc053caa762db901d659336a6e2ffad78ece9ab03ba4f312b00deb6
-DIST faudio-24.07.tar.gz 1125108 BLAKE2B 4ff38ed79c3692f73850c31a0380df6cbafc156eff074e1384c3ef86af459769ba0c742a05b1ebd619b5d24e69bad761f1f7d01cebf526d4568d19e470f02e5a SHA512 bfb265d496c10e1e9fa032506c6de507ba04d5a1384f23cd07b7550b0fd427e78db8a66eede3717b4287ecb6d6695a13c888477d2686350bb7c936cbc6b74c7b
 DIST faudio-24.08.tar.gz 1125131 BLAKE2B a76da292ec74662413aa287147b83978f422d68077b62e3c8d5ad8a324ac1838d130d46ba8e7d32551221e55e73970ddc47ec06e20de905a6dc7cedacafc34fb SHA512 29777408b65ddc77e31d284730a0f3a08a973e29f6a492a7a9af5208b78279d40967ca593a55542aa3de7dd41deb82a31a6291a6bdffd56f04a91674276f95c6
-EBUILD faudio-24.06.ebuild 920 BLAKE2B 12bb27ecc809be0b53cef352bc722a8594c177263fea398710c808577ee77da594b78c0a2f86335d7f62fb81065cc5636e33138281af88cc8d522b7ad3795620 SHA512 9c68c1dcc2ba2e17e5cbac0cadb8fc6ed5eef85cf5d4df133134afc889a577e05ce2bed4a91b5db4e8f0a1f24f61bc48b6dc807e5606415c9a7b5ed1aa8f3594
-EBUILD faudio-24.07.ebuild 922 BLAKE2B c6dd07114357c562b66ac863e8e60b8cfd8186c64eadd5157810f7f9c053bfa458ddff0a73d0c71a6924ec6b9a43c7640351d9c4e9df28b59ef3fd1a11cb91bd SHA512 1b87460b62a618462045196bc288a84d1eef54845cff0cf9f4099320ae7b929f47e32acf29c73bd76563ff6188856636cac884f531893594e8361a3ffbaadce5
-EBUILD faudio-24.08.ebuild 922 BLAKE2B c6dd07114357c562b66ac863e8e60b8cfd8186c64eadd5157810f7f9c053bfa458ddff0a73d0c71a6924ec6b9a43c7640351d9c4e9df28b59ef3fd1a11cb91bd SHA512 1b87460b62a618462045196bc288a84d1eef54845cff0cf9f4099320ae7b929f47e32acf29c73bd76563ff6188856636cac884f531893594e8361a3ffbaadce5
+EBUILD faudio-24.08.ebuild 920 BLAKE2B 12bb27ecc809be0b53cef352bc722a8594c177263fea398710c808577ee77da594b78c0a2f86335d7f62fb81065cc5636e33138281af88cc8d522b7ad3795620 SHA512 9c68c1dcc2ba2e17e5cbac0cadb8fc6ed5eef85cf5d4df133134afc889a577e05ce2bed4a91b5db4e8f0a1f24f61bc48b6dc807e5606415c9a7b5ed1aa8f3594
 MISC metadata.xml 719 BLAKE2B b71b3829f3c1a2a546621b460f3ccc41f79db0acf913f409bc55ad2b8632a8361a7b45952b8aab2f9564391b14f3735f17c10a0e5f46da55fc49b730a743a5e6 SHA512 f52da50d3b16eb8dda8d2af6d7db6ae1e457d48c9a79977cb5288e379446ea4a5e420bd2dc17067d3bcba5cee7838ce10401f319e556d671b0483def94c3f2d7
diff --git a/app-emulation/faudio/faudio-24.06.ebuild b/app-emulation/faudio/faudio-24.06.ebuild
deleted file mode 100644
index 4a59a9b201a5..000000000000
--- a/app-emulation/faudio/faudio-24.06.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FAudio-${PV}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug dumpvoices test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libsdl2[sound]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
-	use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDUMP_VOICES=$(usex dumpvoices)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	einfo "Running faudio_tests, this may take some time without output..."
-	SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
-}
diff --git a/app-emulation/faudio/faudio-24.07.ebuild b/app-emulation/faudio/faudio-24.07.ebuild
deleted file mode 100644
index e372ae484496..000000000000
--- a/app-emulation/faudio/faudio-24.07.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FAudio-${PV}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dumpvoices test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libsdl2[sound]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
-	use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDUMP_VOICES=$(usex dumpvoices)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	einfo "Running faudio_tests, this may take some time without output..."
-	SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
-}
diff --git a/app-emulation/faudio/faudio-24.08.ebuild b/app-emulation/faudio/faudio-24.08.ebuild
index e372ae484496..4a59a9b201a5 100644
--- a/app-emulation/faudio/faudio-24.08.ebuild
+++ b/app-emulation/faudio/faudio-24.08.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FAudio-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug dumpvoices test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 0cfd3e6a1be5..8fa801a3c74f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -25,16 +25,19 @@ DIST libvirt-10.3.0.tar.xz 9476852 BLAKE2B 8c47840113904d72aeb1e9bf900a99a8b0e3d
 DIST libvirt-10.3.0.tar.xz.asc 833 BLAKE2B 4d54a3701a15383464e1be5155344f783cd2fe297f2a7cfd4ef9ead7cef9267122e91e16d08329e2448ffe77f10625a3fa3443bbeab97ba8fc83ec6e4ec250dd SHA512 d32bbc2a36b03eccfc931c3e5accae2d4ed5a59e4d40fc44f8fb269684201097ea03e0afcf6eae124efac7b8c43d32e4e79d276c13ea81809acd40b97ef3ceb9
 DIST libvirt-10.5.0.tar.xz 9530296 BLAKE2B 59b6b114e6d4c4752839775ec22b17f530ac86f0252647b312b7f98e9ba856d949727eed5cb47b6b92589e2ce2587fe02505d6653a4e7ba3a3685b5c81a8ebc0 SHA512 e4976849cff7bdae0b7fda0644490f0ca743efc11c35a2fae45bb0f6f467b85644c1d04d1f3d1b10affdc6d9b8dcc0a3c255e527e0bdd73cdd4d1c81d5c418e7
 DIST libvirt-10.5.0.tar.xz.asc 833 BLAKE2B 38b1138de7585e85b7d0a7a93d487e39552b9db989063c3d354f608e005640aaf27c82e99bdaca0448c9a325349c16e3850ceedec380d3d73de4402cdbaad260 SHA512 f764b5cb9cd520b2a73ada3f2438524792c8c8477727fceb5a56ab7fdae8586308998f2fea21071d2e2dae7d168c6dddb5468f302d9f3bac804d6c8e153b760c
+DIST libvirt-10.6.0.tar.xz 9481992 BLAKE2B 68d88ba7f6d5f74d6ad8753a7716902596338811e9c02b09ba6fbdcc60936abf9509bf5cc300446240fa5dd5d2f779c319bca0a22eadea32b49a758b71524857 SHA512 edec79e89669d5e9a46be35e0d6334a6ed3bbf32426679549bd998bde24cba52b0378843f41a3abb5d781ad53e2a6a54619a0bad3f168c11fb41736cc6af6568
+DIST libvirt-10.6.0.tar.xz.asc 833 BLAKE2B 29c5217b665e8ba697adf39920baf6f824bb5d9fdfe96b68f7d4c4f5849c94e44b14b76435fdb98e033b30de73a79b45502a9ba6e7da76ba139c9ebe0bd183b2 SHA512 da50a4760afc094805f087c01646bf6c8165c54e5bad0569a375a1d0791374c27d35fa3780b7104ab248444ed6f8a8a45c20013e57d5129557d6622a9f2a0721
 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
 DIST libvirt-9.9.0.tar.xz.asc 833 BLAKE2B 3de3674d33c595692e71eeb9c312de76e865d3859d2482ec5b4d29d3cd7644cde080cba0001668efe7876b462f78c0233ab76076ef32943e118b34cca8c1ab4d SHA512 357fc2d1bdbbc26c6e0119a1b5c42e86a116f94bb714da855ab27ca83da0e50c7239d1b8abde3cee8a460ac537f63d518f43470d8329b727b39491771ad191e5
-EBUILD libvirt-10.0.0-r3.ebuild 9930 BLAKE2B 06705c5c3d13a3bedea86cf6688ef5c32124712743b84cc3409154d3d934e3c7ffa4bf3ad47a00fd5e4f6b35b2f93a380553e52113ec32c403aed3a3213cd4e7 SHA512 e74039a6b74013684c6dc8edeca5fbd0d1fc048582a542ef7877e7eb95c0a6dff003635ef3719d1848234eeec650bcc6ec29035d742186beb5681ab3586926e4
-EBUILD libvirt-10.1.0-r2.ebuild 9841 BLAKE2B 3387759f2bc63538ee4d22aaac24f2835c2da1bb9a5c7429ee942383326f99c74d670c030ea150667838b52de167805c05b102b46ca2adfd88d6a815e61f9ef9 SHA512 9ec2f0b858266367803b6a3c62caf6e5bc7c88678da3ca216b49d9011913b94a4a4a8b932d0be0a6fd09d3eed2444cf621cf9dbe463e3917b72da0ca968e8d8d
-EBUILD libvirt-10.2.0-r1.ebuild 9758 BLAKE2B 5809d2cb5526bad269f1d1198c776cf799291256e0f0295b29d0bfc0a5c31f649f251420c41e5c7640933d51eea5902c12c92462e9c11eec7619ab76468501ad SHA512 ee0af5a11be55f42e82d878000f9ecabb1ca28e6eeb36846f2abbad81e5a9f5a0c61dd2455cb6cd82d7547980d5b073d9344c5ea91ae2cfb415cdd6b6ae64186
-EBUILD libvirt-10.3.0-r2.ebuild 9826 BLAKE2B df7818a86b66c2b6a100d955e129d4adad76e3bb8dd9f248f1594c60e560a1e4fc87a7a602e71836ad1cfcf123f7c6e8c7faae5f0a421750ba7a699d1d6057d1 SHA512 a43f74cb62944fd42c93a2adcfc06941a6601b8e76796d5aa52ecd8f835ea4985b5370a718eb5b344b711796ec3995b76d848f47c976b5650d5603298d174e7c
-EBUILD libvirt-10.5.0.ebuild 9708 BLAKE2B 627c86e596cc07cada2cd787eb8a30f0cc34135d5bdabeb37d73c55672d8ac9145b0bf27d9a028ba9250f4492033429d86b6f72aa5eee559fd3d998894aef51d SHA512 1e768c40359032f620e97a4281b33ee3cc43fd2bf4a8a7cf1a5ddf72798d718d8f45ca4d00300bb5ee4c5979611e16e27cbd1861f924a02a2765266ac31696f2
-EBUILD libvirt-9.8.0-r3.ebuild 9734 BLAKE2B 49cc04e4aa366554cd6b401bee166fc5a22477fc012591f8f8276fc314fa393c6c617f5b4b7fe57e6405bf5299c45003593e7fae1b93ac776b8025b826b73182 SHA512 6a4838e55b16e5ff628cb89942002f69872a2937d3ef5e6bfcccc1a3502676e750b77b9f505f5d675d32057171e1bda7c9cff1581fe3310b7021f5d8213773d5
-EBUILD libvirt-9.9.0-r3.ebuild 9788 BLAKE2B 6ddcff5c97731919c9e31928f2a1d91f9f755799c9ec8d0629b250631b8e385ace20ed5d28f27332dc69fe35acfce8b2e02b56a5164eeb75eee8a274f41c5c34 SHA512 998f07a91bb1a41ff8b0c1fcdb771d6c2827472a1044b8dd1c7d8315d66a7a9cbd2ee1dcdf071dcdc622754e934ccf973a71373ce5736b5b5d680d3611971cde
-EBUILD libvirt-9999.ebuild 9708 BLAKE2B 627c86e596cc07cada2cd787eb8a30f0cc34135d5bdabeb37d73c55672d8ac9145b0bf27d9a028ba9250f4492033429d86b6f72aa5eee559fd3d998894aef51d SHA512 1e768c40359032f620e97a4281b33ee3cc43fd2bf4a8a7cf1a5ddf72798d718d8f45ca4d00300bb5ee4c5979611e16e27cbd1861f924a02a2765266ac31696f2
+EBUILD libvirt-10.0.0-r4.ebuild 9951 BLAKE2B 2e8585903a3fff39dbb603e22fdeea0094cf6e550aa70ef3d93482f7fc54cc8aa6a3260492d94468d9660b354cf0f9838c09152f4e932082a7942eed4cda731b SHA512 8b517df3cb550e1462ece2e72bd91e79287af94f5e7b77ed67f7230b7e6a6877aaac5a18fc5eb8ec12bb153d577cc916b5c3bbc42731a72cd777e69214462144
+EBUILD libvirt-10.1.0-r3.ebuild 9862 BLAKE2B 5dcc3770f0310dd2c15243310675f35c8d1bb6b3760a82e27c2a3cf8ee8ecbe9fc691fa280b72634b92aba47aa1d7f94900eced19f4fb74126788c22fc1dfd49 SHA512 346a481d90b1ce2fd401b83748fd4113eae548d02af9551e7f955020bb006bda30d4abfc9400d725504d18c3e2af47ecee17259d8ea5dbd7c53625c17a8a38db
+EBUILD libvirt-10.2.0-r2.ebuild 9779 BLAKE2B 1d488ccfa1b8753e7a3146013930253c6293024356a3c4c925a10fafa5720d1c5d42cdb5f6b638f9d4131f7dc027d6e2872eab6441390f0f680c774e6cd04488 SHA512 6063d4da4f02afea9ec20c120e22bc35cfc8a8c0714d1f75e8143b5fc5f4c5da99fa26b6f1f788fef82fabcf4f66d745ca80e2d1ccc587e6743bde34eda91100
+EBUILD libvirt-10.3.0-r3.ebuild 9847 BLAKE2B 7820ece67959e1a13f0bf74f3a3ade086b27cd0f2d516236ddb7313f4466c2ddc759b5a5555b34f6e9a9f43d519b93d28f543fd81b5fd55643eb9d8a9a7ca6f8 SHA512 94800e2f925530cf4599af38684f55153a05529352c90ae6418f1ba5f595fe17a4c83308e06d11621d7b8b4c44cc40169793863ad6d295c3f9b13dcdede9267f
+EBUILD libvirt-10.5.0-r1.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814
+EBUILD libvirt-10.6.0.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814
+EBUILD libvirt-9.8.0-r4.ebuild 9816 BLAKE2B aaab31d0d6aacc3fae263913a88c0eb00fd20ac60bcc6691907e2d8ad21032fe2c7b4cf79a5ba66aac82e5670855f474b7151d7783995bc5a79514195cc27370 SHA512 5e222e930979a60ac4d3ae834b54413d75d93618f679ea1de39e2da4c2fbbcd57827c6a43f09e79afe725f818338d30050d80e6a2253b432f4f65a966ebcb177
+EBUILD libvirt-9.9.0-r4.ebuild 9870 BLAKE2B b7cda169e257c81bbe1006c6531839fb5b4291f5b26c014f5ade70307989420fdac427b28194300b0090d1dd26062036d6de539cf3451d459ce15d39ada8c967 SHA512 504399a1ebf0ba8bec93dd008a952e984a2d6fc5c4cc8c9485032966f3455d2e0d271a461b2588d50f4fe98210bbe5b83d2ced1f0b45021ec69750ff3696f99d
+EBUILD libvirt-9999.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814
 MISC metadata.xml 3822 BLAKE2B badb40564def06854a0c3af011b5de2888d722996c9b15df570a709161e49796f3d76ba2365c4adc1724f16bee3518d0e87ed6d2619d505b5ba2f1fd02c90f34 SHA512 f31e86b4d0c1faaf5bf0ac253cf20ce7728b94841debb590356efc0fa1e1a3d095a94e69ce0a34f793faadf10ed00ae1212aac54d13288f1975db4f032fd8b50
diff --git a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
index e1f5b32c94f2..69cebb86b3af 100644
--- a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
index 4b7123665d73..79ac27610a78 100644
--- a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
index f888ab84e3c8..a3d8c0af30fc 100644
--- a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
index 1bdfb61feab9..f0f0337d8804 100644
--- a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-10.5.0.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
index 6c1f35a42d3e..315ce62b97a9 100644
--- a/app-emulation/libvirt/libvirt-10.5.0.ebuild
+++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild b/app-emulation/libvirt/libvirt-10.6.0.ebuild
new file mode 100644
index 000000000000..315ce62b97a9
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.6.0.ebuild
@@ -0,0 +1,382 @@
+# 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..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://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 nbd nfs nls numa
+	openvz 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 openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.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(-)] )
+	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/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-firewall/nftables
+		)
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	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}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.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"
+
+	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 nbd nbdkit)
+		$(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.8.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
index 2da56ec3143d..62d04583be8e 100644
--- a/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
@@ -30,8 +30,8 @@ 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
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
 RESTRICT="!test? ( test )"
@@ -91,6 +91,10 @@ RDEPEND="
 	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
@@ -274,6 +278,7 @@ src_configure() {
 		$(meson_feature lvm storage_lvm)
 		$(meson_feature lvm storage_mpath)
 		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd libnbd)
 		$(meson_feature nls)
 		$(meson_feature numa numactl)
 		$(meson_feature numa numad)
diff --git a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
index 18388bf95abe..9ccc939d1bfc 100644
--- a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
@@ -30,8 +30,8 @@ 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 virtiofsd
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
 RESTRICT="!test? ( test )"
@@ -91,6 +91,10 @@ RDEPEND="
 	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
@@ -275,6 +279,7 @@ src_configure() {
 		$(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)
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 6c1f35a42d3e..315ce62b97a9 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	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 )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2