13 files changed, 304 insertions, 489 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a6585c0215e2..995d01cdc1c1 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 2b8bdb20b558..e66ecd77f9b1 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,11 +1,9 @@
 AUX cloud-init-24.2-systemd.patch 6036 BLAKE2B 410cf02f66d19adfa11ff7359bd539fad860dd8a37412b1023ce11017cd4921782c3aa279d16182012af9ce5b5776273de0b05c83e850104768b5968435221ab SHA512 4f82ffe1a4f78487c65cbf52920f2ae4720ad02a148cdd4dea02b3d9cc96209cbd978559b0964f25d832ce700e47bb3082fe8b180a783251e36cef941238331f
 AUX cloud-init-24.4-netcat.patch 3606 BLAKE2B 8fbe9919b99eef3212b0ae6f6e8c4ebaf492a706f0232e31de301a84d7f0ccff72f842694bb7d4faaeced9f48f09bb997e1b38115b8de6612e5c2575a36752a2 SHA512 450d66f1aa2e85e7e532d2104547b640426bdf0a32a734f25c2a2d94a76b0a68b5a05770f5899f6ba65624e90c1b731165972d3cc5133e55460f0e6aafd48acd
-DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359 SHA512 34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13
-DIST cloud-init-24.2.tar.gz 1786275 BLAKE2B 21f5209a77ef401d12271f6ea695d84065b22f40b7273dd8709dee5fadc7038a0f59a9a3dd53b73812a44a603b5cdc7fb36b71fcdb1f2d4295d87d2cc6069fcd SHA512 72de351b3e978e01a4695b58987d942cc1b2faee749ac0df2024a839e0e1539c9b1f0a9e5cf1930e33c36344d152b7580cfe2dd55f95ad4f669df9b4dda4648d
 DIST cloud-init-24.4.tar.gz 1871271 BLAKE2B 438d1296a637211d7a43c9969de6d432b1ab787beab7f617426cdeab67d1c1df28e1adfa610af4dad44c7f46850954ad3d1856bfff143648da0f87fbc4ebdefc SHA512 1c6901497848d8be29ffb0a7bcbbd2df89d0a2b35a65c33f3db9562a544d9e832308f448dcc24a555791b40f00aca32e5d25b8ad3ccb5e90dda6268e5a125f9c
-EBUILD cloud-init-23.4.ebuild 2362 BLAKE2B 0ad4cd3a7ff10f1eb4c8ba8a904f8b1c26a65019c01419a8154a3e15069ae7d52e0228246a13d26d134f359fac0b72b7205b17042a20e43a410fa1a6c2d94713 SHA512 a9aaddc3e11e999e4be33c312d42bd117f2ac99883695959e58dec174c3dfec435c5e722e5384c48d1baf6934dbecb498f142adc9404c7d482aa4c9c111dc1db
-EBUILD cloud-init-24.2-r1.ebuild 2558 BLAKE2B 90422320e92fbaacfc8a74c4353f0b3b4326cdc958544d8160fe4f2da934b2efef38b1896ee1e84d014a8e64cac8d68c2476f4780511dc7dc1889e06f8e6e289 SHA512 cb4fa4fe176182b9def0ef994d63c701a31290076f4d06d46c0dc68965ce938cab451ed6f215f7eb22e0621a26fd95bdcc66e19d0d56de981a2da4660a27c0e3
-EBUILD cloud-init-24.2.ebuild 2501 BLAKE2B f54a3b02b334e2470ca858065c0ec484c69845db2361e888523e3d45685d3999f4f2e682f9e1eb9f5efe1b666ba813e949ac07aacf08a78442090fc0ae4f8b8f SHA512 bcecb78eefe8e70b93f2915501306a5f98129d43a7550ed15378bf0243e378ebbf72bbb6fcdd6b98d1c5d3fc675c5b417d9bdbf4e00bfa07c387343f3afddb22
-EBUILD cloud-init-24.4-r3.ebuild 2626 BLAKE2B ece8fc554b7da53e0d350f247877226db1da56924b4e1c57b5492f8f79af6f52a0d4f05afa75dfd20d7ee00c2950f8b2c26ca0c599ca5619437c0daac164113d SHA512 c8066d6562aa3497f576b8f21e37b2022d3ce201e8591f928fa1009d466f51e8b5629fff89bd9731b7833e828b3afea824c158d3e67a9a607996dc4616f5bcb9
-EBUILD cloud-init-9999.ebuild 2534 BLAKE2B 84d307da57bc653641d69e94c7efd4d15426a1bf5a37ff5bf251dc53984b4089da624d338ceae4ae0fb6aac461bfcfcb5344eba42c571869bcda7bc851ffc61f SHA512 abbc02fdf84b0a102ea142c322084723ba6e2354b35dfe78184dcff4967cfd3ad31613fbfc7836ff9a46b15038d0380256b9de686597bafef655eda164ceede4
+DIST cloud-init-25.1.tar.gz 1892801 BLAKE2B 7efc5cb8d1f3c63c7b22660873f8c62d49a32d4f09a16df41777a6e41555606ebb5186c29f5d20396dfabc190f2034f88517076c5e342cb8bc04249bbfcee4a4 SHA512 2a40234e92bd27e12a48ab6d62c638599d82deaaf9b69d9ba2deed6a8234e16fcd5e35e995c1880d61c2a60fbea7699ae73ea849f2f4153067ef4aa8af1b4adf
+EBUILD cloud-init-24.4-r3.ebuild 2622 BLAKE2B bc1b299fd4e2b6e3daa26b322dc4c2b599437bc16a8aed0e8d6c860c69222631eef89c09c2749f7f47f67762644da5f96efab873415992029f997f134e4cc3da SHA512 553c5620ffa6a6a99bfdd12a53edf1065b3fadbdf65b047d4ea87e7571867fafb1491f9095ab5c4d5b1bfb897d2a796bbb2776106f1e7f74d85ba9e9bd933e4a
+EBUILD cloud-init-24.4-r4.ebuild 2901 BLAKE2B b820e25b3c6847b4a8049cddd0c34245cf1f7d690dac581489ca78800e49bff7932289af13b35035bb6782995fd9e971df3afbbebeeb825f2926addf413363e0 SHA512 98a9df8072ae28c6d32c662fced7c39803ed901acfcc1340e383ec5f003d9d126be5081f93cb550a2214141f2334a08fb1c40d531db24fb3beea2e42cbe7ad12
+EBUILD cloud-init-25.1.ebuild 2809 BLAKE2B e3cbae18ba0ddad24c4ae34b800b92a4e34d6628d3eb3e9aea01afc0112997ba9d752cff958979f0053770c000b387deb8265feac0729484e00055ce7538d59c SHA512 b62c652f2e7e2c6caaccc0c4380a9ff8107e69b03004f01530816fe78861d0d9fe8785193929c0f9a0f1e701be66ea40239a9b829766d5934faf3e24f23788cd
+EBUILD cloud-init-9999.ebuild 2809 BLAKE2B e3cbae18ba0ddad24c4ae34b800b92a4e34d6628d3eb3e9aea01afc0112997ba9d752cff958979f0053770c000b387deb8265feac0729484e00055ce7538d59c SHA512 b62c652f2e7e2c6caaccc0c4380a9ff8107e69b03004f01530816fe78861d0d9fe8785193929c0f9a0f1e701be66ea40239a9b829766d5934faf3e24f23788cd
 MISC metadata.xml 714 BLAKE2B 22888016216cea9e471f7cef63e94022c344961263a3319508d5b23db64eeaaeb34a470fc51482bf7a0a4cb658dd814f5655393ee4498a7212ccec28caee5256 SHA512 3bd7be60f29d5a1e4a830577c0afc8c5925123f1258a78b82dbc36c8f76f096149db8bcebfaf3b6db5feeab0bc82ccb65d7d71ec12feb4f56027f05eeb930401
diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild b/app-emulation/cloud-init/cloud-init-23.4.ebuild
deleted file mode 100644
index 7c57b58c388c..000000000000
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Disabled for now: bug #850628
-# https://bugs.launchpad.net/cloud-init/+bug/1978328
-#DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
-
-inherit distutils-r1 udev
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-	selinux? ( sec-policy/selinux-cloudinit )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/* || die
-}
-
-pkg_prerm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-24.2-r1.ebuild b/app-emulation/cloud-init/cloud-init-24.2-r1.ebuild
deleted file mode 100644
index 8c137fe19521..000000000000
--- a/app-emulation/cloud-init/cloud-init-24.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Disabled for now: bug #850628
-#DISTUTILS_USE_PEP517=setuptools
-# https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
-
-inherit distutils-r1 udev
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="selinux"
-
-CDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-	selinux? ( sec-policy/selinux-cloudinit )
-"
-
-EPYTEST_IGNORE=(
-	# Can't find file
-	tests/unittests/config/test_apt_configure_sources_list_v1.py
-	tests/unittests/config/test_apt_configure_sources_list_v3.py
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-24.2-systemd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/* || die
-}
-
-pkg_prerm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-24.2.ebuild b/app-emulation/cloud-init/cloud-init-24.2.ebuild
deleted file mode 100644
index 8af6d1682ee4..000000000000
--- a/app-emulation/cloud-init/cloud-init-24.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Disabled for now: bug #850628
-#DISTUTILS_USE_PEP517=setuptools
-# https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
-
-inherit distutils-r1 udev
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ppc64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="selinux"
-
-CDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-	selinux? ( sec-policy/selinux-cloudinit )
-"
-
-EPYTEST_IGNORE=(
-	# Can't find file
-	tests/unittests/config/test_apt_configure_sources_list_v1.py
-	tests/unittests/config/test_apt_configure_sources_list_v3.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/* || die
-}
-
-pkg_prerm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild b/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild
index 953aeaac7af3..51f5f85f1cbd 100644
--- a/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild
+++ b/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 else
 	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~loong ppc64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
diff --git a/app-emulation/cloud-init/cloud-init-24.4-r4.ebuild b/app-emulation/cloud-init/cloud-init-24.4-r4.ebuild
new file mode 100644
index 000000000000..99a282a85204
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-24.4-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit edo python-single-r1 udev
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/oauthlib[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/netifaces[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/passlib[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	net-analyzer/macchanger
+	net-analyzer/openbsd-netcat
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+	selinux? ( sec-policy/selinux-cloudinit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-24.2-systemd.patch"
+	"${FILESDIR}/${PN}-24.4-netcat.patch"
+)
+
+EPYTEST_IGNORE=(
+	# Can't find file
+	tests/unittests/config/test_apt_configure_sources_list_v1.py
+	tests/unittests/config/test_apt_configure_sources_list_v3.py
+	# PORTAGE_TMPDIR too long for unix sockets
+	tests/unittests/test_all_stages.py
+	# TODO
+	tests/unittests/config/test_schema.py
+)
+
+src_prepare() {
+	default
+
+	# Fix location of documentation installation
+	sed -i "s:USR + \"/share/doc/cloud-init:USR + \"/share/doc/${PF}:" setup.py || die
+
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	fi
+}
+
+src_compile() {
+	edo ${EPYTHON} setup.py build
+}
+
+src_test() {
+	epytest
+}
+
+src_install() {
+	edo ${EPYTHON} setup.py install \
+		--prefix="${EPREFIX}/usr" \
+		--root="${D}" \
+		--init-system=sysvinit_openrc,systemd \
+		--distro gentoo
+	python_optimize
+
+	keepdir /etc/cloud
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/cloud-init-25.1.ebuild b/app-emulation/cloud-init/cloud-init-25.1.ebuild
new file mode 100644
index 000000000000..9f7db580b998
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-25.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit edo python-single-r1 udev
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/oauthlib[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/netifaces[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/passlib[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	net-analyzer/macchanger
+	net-analyzer/openbsd-netcat
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+	selinux? ( sec-policy/selinux-cloudinit )
+"
+
+EPYTEST_IGNORE=(
+	# Can't find file
+	tests/unittests/config/test_apt_configure_sources_list_v1.py
+	tests/unittests/config/test_apt_configure_sources_list_v3.py
+	# PORTAGE_TMPDIR too long for unix sockets
+	tests/unittests/test_all_stages.py
+	# TODO
+	tests/unittests/config/test_schema.py
+)
+
+src_prepare() {
+	default
+
+	# Fix location of documentation installation
+	sed -i "s:USR + \"/share/doc/cloud-init:USR + \"/share/doc/${PF}:" setup.py || die
+
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	fi
+}
+
+src_compile() {
+	edo ${EPYTHON} setup.py build
+}
+
+src_test() {
+	epytest
+}
+
+src_install() {
+	edo ${EPYTHON} setup.py install \
+		--prefix="${EPREFIX}/usr" \
+		--root="${D}" \
+		--init-system=sysvinit_openrc,systemd \
+		--distro gentoo
+	python_optimize
+
+	keepdir /etc/cloud
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index 128407ca66ec..9f7db580b998 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# Disabled for now: bug #850628
-#DISTUTILS_USE_PEP517=setuptools
-# https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit edo python-single-r1 udev
 
-inherit distutils-r1 udev
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -18,36 +17,43 @@ else
 	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 fi
 
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="selinux"
-
-CDEPEND="
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/oauthlib[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/netifaces[${PYTHON_USEDEP}]
+	')
 "
 BDEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/passlib[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+		')
 	)
 "
 RDEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	net-analyzer/macchanger
 	net-analyzer/openbsd-netcat
 	sys-apps/iproute2
@@ -60,29 +66,40 @@ EPYTEST_IGNORE=(
 	# Can't find file
 	tests/unittests/config/test_apt_configure_sources_list_v1.py
 	tests/unittests/config/test_apt_configure_sources_list_v3.py
+	# PORTAGE_TMPDIR too long for unix sockets
+	tests/unittests/test_all_stages.py
+	# TODO
+	tests/unittests/config/test_schema.py
 )
 
-distutils_enable_tests pytest
+src_prepare() {
+	default
 
-python_prepare_all() {
 	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	sed -i "s:USR + \"/share/doc/cloud-init:USR + \"/share/doc/${PF}:" setup.py || die
 
 	if [[ ${PV} == *9999 ]] ; then
 		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
 	fi
+}
 
-	distutils-r1_python_prepare_all
+src_compile() {
+	edo ${EPYTHON} setup.py build
 }
 
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+src_test() {
+	epytest
 }
 
-python_install_all() {
-	keepdir /etc/cloud
+src_install() {
+	edo ${EPYTHON} setup.py install \
+		--prefix="${EPREFIX}/usr" \
+		--root="${D}" \
+		--init-system=sysvinit_openrc,systemd \
+		--distro gentoo
+	python_optimize
 
-	distutils-r1_python_install_all
+	keepdir /etc/cloud
 
 	# installs as non-executable
 	chmod +x "${D}"/etc/init.d/* || die
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
deleted file mode 100644
index 3e68bed72039..000000000000
--- a/app-emulation/vkd3d/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vkd3d-1.13.tar.xz 1123980 BLAKE2B 1b144ce9bd4351b59f1fc36f342d40f448ae45e8293968c1326ad74ec2a065a45ca543f7837fb0ab905caeaff2b38e54b76d81174839655465ed8a5cc3d024d5 SHA512 a2cb339aa68c01d961a67236fb3f5d247f359fce73aabe948933a02102a63029fb697ea8577e3086458c5fd59b787f74957b7a79534394960df8b6052fd0f993
-DIST vkd3d-1.14.tar.xz 1185324 BLAKE2B 17f719f6b28cb4b795ebfde5923dc36e97dfb0f7ba8687818c31a7b8c9c55e29eaee29504772a1c917ff90c38d77dceb76973bdc5b102978942810a930904b6e SHA512 db4429b591aa4a129361e9225241b6e5ec703f6877cafba235cbbf5d5dfc31eb37a80470f8d1295c46f68b99db715c8a54dced0d287fcea1c9174aa19ac4577d
-EBUILD vkd3d-1.13.ebuild 1535 BLAKE2B 68cd617843ca3aa7f68baa17d32ff702701efb90dbfe85d7e339544a1c430791c4de013b84369ef895bad7039b69f3e012d8a9d543256527beaf5daa889449fb SHA512 3af8072ac657237db0fd6a765d06af632fb112cf6ab073fe42ac8b293690843e252ef5228b5d11b95d9d130ee8268505b676c66481bdfd85e093c08ab5df661d
-EBUILD vkd3d-1.14.ebuild 1535 BLAKE2B 68cd617843ca3aa7f68baa17d32ff702701efb90dbfe85d7e339544a1c430791c4de013b84369ef895bad7039b69f3e012d8a9d543256527beaf5daa889449fb SHA512 3af8072ac657237db0fd6a765d06af632fb112cf6ab073fe42ac8b293690843e252ef5228b5d11b95d9d130ee8268505b676c66481bdfd85e093c08ab5df661d
-MISC metadata.xml 563 BLAKE2B c976a16a495bdb5863811acda56b2cc628683a63fc2a22c18d2a09775d3a38c845e00f83b97b318d9a0e5267bb470dd56d334dc9f43e3716784254802b8db60b SHA512 3d5afb7890b3b10ad424fcfe3fa2b42a9227ba0b82be8ab85308126966f476798818ee0ecc88c53105b218f465a72b213efe00968112431169884a4a6f48c6a8
diff --git a/app-emulation/vkd3d/metadata.xml b/app-emulation/vkd3d/metadata.xml
deleted file mode 100644
index b0dd7bc28e6e..000000000000
--- a/app-emulation/vkd3d/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>wine@gentoo.org</email>
-		<name>Wine</name>
-		<description>
-			This package must be kept in sync with repo/proj/wine repository.
-			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
-		</description>
-	</maintainer>
-	<use>
-		<flag name="spirv-tools">Enable SPIRV shader debugging support using <pkg>dev-util/spirv-tools</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/app-emulation/vkd3d/vkd3d-1.13.ebuild b/app-emulation/vkd3d/vkd3d-1.13.ebuild
deleted file mode 100644
index 60928e0866c3..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: This package is only needed by old wine-7 given >=8 builds a
-# bundled PE vkd3d using mingw rather than use the shared ELF library.
-#
-# Also unclear if bumping is safe, newer vkd3d is hardly tested with
-# old Wine and its old vulkan support. Quite possibly already unusable
-# but there is very few users of wine-7+d3d12 to report issues.
-#
-# Either way can be last-rited whenever wine-{vanilla,proton}-7 are gone,
-# or alternatively USE=vkd3d could be masked/removed if broken.
-
-inherit multilib-minimal
-
-DESCRIPTION="D3D12 to Vulkan translation library"
-HOMEPAGE="https://gitlab.winehq.org/wine/vkd3d/"
-SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ncurses spirv-tools"
-RESTRICT="test" #838655
-
-RDEPEND="
-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-	ncurses? ( sys-libs/ncurses:= )
-	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/spirv-headers
-	dev-util/vulkan-headers
-"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local conf=(
-		$(multilib_native_use_with ncurses)
-		$(use_with spirv-tools)
-		--disable-doxygen-pdf
-		--without-xcb
-		# let users' flags control lto (bug #933178)
-		vkd3d_cv_cflags__flto_auto=
-	)
-
-	ECONF_SOURCE=${S} econf "${conf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-emulation/vkd3d/vkd3d-1.14.ebuild b/app-emulation/vkd3d/vkd3d-1.14.ebuild
deleted file mode 100644
index 60928e0866c3..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.14.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: This package is only needed by old wine-7 given >=8 builds a
-# bundled PE vkd3d using mingw rather than use the shared ELF library.
-#
-# Also unclear if bumping is safe, newer vkd3d is hardly tested with
-# old Wine and its old vulkan support. Quite possibly already unusable
-# but there is very few users of wine-7+d3d12 to report issues.
-#
-# Either way can be last-rited whenever wine-{vanilla,proton}-7 are gone,
-# or alternatively USE=vkd3d could be masked/removed if broken.
-
-inherit multilib-minimal
-
-DESCRIPTION="D3D12 to Vulkan translation library"
-HOMEPAGE="https://gitlab.winehq.org/wine/vkd3d/"
-SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ncurses spirv-tools"
-RESTRICT="test" #838655
-
-RDEPEND="
-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-	ncurses? ( sys-libs/ncurses:= )
-	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/spirv-headers
-	dev-util/vulkan-headers
-"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local conf=(
-		$(multilib_native_use_with ncurses)
-		$(use_with spirv-tools)
-		--disable-doxygen-pdf
-		--without-xcb
-		# let users' flags control lto (bug #933178)
-		vkd3d_cv_cflags__flto_auto=
-	)
-
-	ECONF_SOURCE=${S} econf "${conf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}