4 files changed, 3 insertions, 82 deletions
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 7870980e6b5e..02af1535b98c 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,6 +1,3 @@
-AUX test.patch 1713 BLAKE2B 6b6322c9db1cfd1832a8752dda4bc91cc5d92a7cf4109eb8727dbbf484ccb1b6ef482dac4f9a656adcdd0872b262fca5dae183ba1e0b81befca5026a7facd5dc SHA512 c7dd54e67e8379f05746b0985708b69331623ebd6bfee393c48115cef5ca90423723f4c39b5e33f7fb30953da9629e4419f4343c573bcbd766d9f57dd911ab34
-DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b
 DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7
-EBUILD cdist-6.9.8.ebuild 761 BLAKE2B 7059616146fd1ba0fa8786ff490ed59656e0cbe7284a3e2fe20f27bad09a52097cf4d18543826de4c30026ed5900152a684cb0d5006b7deddec6873031d5c635 SHA512 6e75002987b83ff6be7b3dfc495f1469dffbed075562d151600ed917a5ad930281240ef669ed7d526405777203f0fb00f59457b86a216cddbeaad67d97087cc8
-EBUILD cdist-7.0.0.ebuild 730 BLAKE2B a309b47593bfcf2a79f7b5f51ccca8a41a98a6f636bc7997abf646cea64c5c0608085db1a8654fbe3e3fae303a4156082fdd1a811dfe2a70174e082b9f94620f SHA512 f139a134d4eb98449da8e2878699b2325104572501952ac60a0b1ab0d04f7bb8060665da62d01ba41c83da29922267ad110d76ed11ed45eb5d3ef4395b16e8e6
+EBUILD cdist-7.0.0.ebuild 731 BLAKE2B 82c9c631f156357b3761ca507e35871882a305be7d70d0953ee955f93e66247ab2a2f846bc4bd51efd8d6b60227ee3e64d1403a2921864f1ba8bacdf02315ea3 SHA512 9665b7a6e54eb55091cdad4c3a1500b687f7e1921ca628baaad9094025780dd1261f926add2274efa11edcd03d1f944da3d9cd3fd6c5b9635bd6055253324c30
 MISC metadata.xml 236 BLAKE2B 354b036d8fa34ea50195ab2125b113da315ba5254902cebee161e7b8710904dee7a9ae42bddd0b3b6cedb8021bbb60a35c705d993f2065ad9a8d662a0efb8c3a SHA512 dbdc16a1739daf1ed58da5e6ff4bac4a03d52b2ab62e47c6db96ff4d8bf4080b4c2f3a02e566152eacc0a54afa69b18e3d8fbfd0f47361774e78f4d41656462c
diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild
deleted file mode 100644
index 4e75b661c296..000000000000
--- a/app-admin/cdist/cdist-6.9.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
-SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/test.patch )
-
-distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	echo "VERSION='${PV}'" > cdist/version.py || die "Failed to set version"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/cdist/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0.ebuild
index 074a43f466ea..6a67147f107c 100644
--- a/app-admin/cdist/cdist-7.0.0.ebuild
+++ b/app-admin/cdist/cdist-7.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch
deleted file mode 100644
index ebc9d944ba57..000000000000
--- a/app-admin/cdist/files/test.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917
-https://bugs.gentoo.org/831362
-From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
-Date: Tue, 16 Nov 2021 11:11:45 +0100
-Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X
-
----
- cdist/integration.py     | 2 +-
- cdist/util/fsproperty.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cdist/integration.py b/cdist/integration.py
-index 17b65f09..04470ea7 100644
---- a/cdist/integration.py
-+++ b/cdist/integration.py
-@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose,
-     """
-     if isinstance(host, str):
-         hosts = [host, ]
--    elif isinstance(host, collections.Iterable):
-+    elif isinstance(host, collections.abc.Iterable):
-         hosts = host
-     else:
-         raise cdist.Error('Invalid host argument: {}'.format(host))
-diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py
-index 09e9cc19..6bf935e8 100644
---- a/cdist/util/fsproperty.py
-+++ b/cdist/util/fsproperty.py
-@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error):
-         return 'Absolute path required, got: {}'.format(self.path)
- 
- 
--class FileList(collections.MutableSequence):
-+class FileList(collections.abc.MutableSequence):
-     """A list that stores it's state in a file.
- 
-     """
-@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence):
-         self.__write(lines)
- 
- 
--class DirectoryDict(collections.MutableMapping):
-+class DirectoryDict(collections.abc.MutableMapping):
-     """A dict that stores it's items as files in a directory.
- 
-     """