gentoo resync : 02.02.2022

4 files changed, 64 insertions, 13 deletions

diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 58f09fbc21e2..916beafbed7a 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,3 +1,4 @@
-DIST cdist-6.9.4.tar.gz 1362226 BLAKE2B c9f9c85b586718e8cd1fe1a88bed5603b0e1c4ddbf398caab033b3adacc056349edb44f9a597f6810a08fef0598260c350d307eafd16c7be43e556a586294800 SHA512 ba139ab404e8167530cc36461bf83443a3b7d289a4cd7daee2286e9610846ac0b75737899defe08dafa873d1c1b369f9a412c828c98c8aae9130713bf5a7ec77
-EBUILD cdist-6.9.4.ebuild 676 BLAKE2B 814139667be230ac57a8bf7b307a2f30852e7d3a99312d999851132685562ce643d98174ab6212a4d5933c9a03092ed12eeea8c9f96f92b33d42587caa102bdb SHA512 2d11bd2b4b02ba258971be997b59eed7966573ac221a9981efba4b49c9af06353579105648075d80f5bc28f7e0756e197755523bf4f1f9bf9584db5755c02dc9
-MISC metadata.xml 241 BLAKE2B 81a1e0fb8d8312fb6a4407309677a049cd2e1d2ac27de365302cfb92fb452922f74b8b58154f9ede848052a66cbc58482145e1ed68d48c201b0a9d4282e995bc SHA512 bb3cb9d6391bc615f823305ff42cb874cb8c14ab972c59f29c2215415bf907f576746fefa3fca3d075d720201dd6563d9eea9157e123aec9c06f18821452215d
+AUX test.patch 1713 BLAKE2B 6b6322c9db1cfd1832a8752dda4bc91cc5d92a7cf4109eb8727dbbf484ccb1b6ef482dac4f9a656adcdd0872b262fca5dae183ba1e0b81befca5026a7facd5dc SHA512 c7dd54e67e8379f05746b0985708b69331623ebd6bfee393c48115cef5ca90423723f4c39b5e33f7fb30953da9629e4419f4343c573bcbd766d9f57dd911ab34
+DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b
+EBUILD cdist-6.9.8.ebuild 761 BLAKE2B 432065653dc3edd53b64a15e89a420c289bf4d4a255d2e2422203c7b84ec67abba443161e79820d54a79ffdd5e980d611564648ce9dc6bb672d9b6e9a95e023c SHA512 7e799ec29396c6c1fd19a4e3bb2a03e10d24dba853b10ed2bd5bb3925469ac2b5e73aaa9d4dae83cd14452a24f98407da5fbc82cedce839d147d2e095db52441
+MISC metadata.xml 236 BLAKE2B 354b036d8fa34ea50195ab2125b113da315ba5254902cebee161e7b8710904dee7a9ae42bddd0b3b6cedb8021bbb60a35c705d993f2065ad9a8d662a0efb8c3a SHA512 dbdc16a1739daf1ed58da5e6ff4bac4a03d52b2ab62e47c6db96ff4d8bf4080b4c2f3a02e566152eacc0a54afa69b18e3d8fbfd0f47361774e78f4d41656462c
diff --git a/app-admin/cdist/cdist-6.9.4.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild
index 7fb25712179a..6b089e690af3 100644
--- a/app-admin/cdist/cdist-6.9.4.ebuild
+++ b/app-admin/cdist/cdist-6.9.8.ebuild
@@ -1,26 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
-PYTHON_COMPAT=( python3_{7..9} )
 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}/cdist-${PV}.tar.gz"
+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
-
+	echo "VERSION='${PV}'" > cdist/version.py || die "Failed to set version"
 	distutils-r1_python_prepare_all
 }
diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch
new file mode 100644
index 000000000000..ebc9d944ba57
--- /dev/null
+++ b/app-admin/cdist/files/test.patch
@@ -0,0 +1,47 @@
+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.
+ 
+     """
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
index 7be250f746ed..74e24b939131 100644
--- a/app-admin/cdist/metadata.xml
+++ b/app-admin/cdist/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">cdist</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">cdist</remote-id>
+	</upstream>
 </pkgmetadata>