* [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/
@ 2020-11-30 21:40 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-11-30 21:40 UTC (permalink / raw
To: gentoo-commits
commit: f75063119d5cc0c0be8f2ff7cead52eb6d11fe2e
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Nov 30 21:39:33 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 21:39:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7506311
app-admin/cdist: bump to 6.9.2
Closes: https://bugs.gentoo.org/757351
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-admin/cdist/Manifest | 1 +
app-admin/cdist/cdist-6.9.2.ebuild | 29 ++++++++++++++++++
app-admin/cdist/files/cdist-6.9.2-tests.patch | 44 +++++++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index bc4b2680265..4ddefa33b7f 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -2,3 +2,4 @@ DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b
DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741
+DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1
diff --git a/app-admin/cdist/cdist-6.9.2.ebuild b/app-admin/cdist/cdist-6.9.2.ebuild
new file mode 100644
index 00000000000..7b119c0cb7b
--- /dev/null
+++ b/app-admin/cdist/cdist-6.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
+
+# only required for py3.6 compatibility
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+python_prepare_all() {
+ echo "VERSION='${PV}'" > cdist/version.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/app-admin/cdist/files/cdist-6.9.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch
new file mode 100644
index 00000000000..df99b74d9b8
--- /dev/null
+++ b/app-admin/cdist/files/cdist-6.9.2-tests.patch
@@ -0,0 +1,44 @@
+--- a/cdist/preos.py
++++ b/cdist/preos.py
+@@ -7,7 +7,7 @@ import cdist
+ import logging
+ import cdist.argparse
+ import cdist.configuration
+-import cdist.exec.util as util
++from cdist.exec import util
+
+
+ _PREOS_CALL = "commandline"
+--- a/cdist/exec/local.py
++++ b/cdist/exec/local.py
+@@ -34,7 +34,7 @@ import datetime
+ import cdist
+ import cdist.message
+ from cdist import core
+-import cdist.exec.util as util
++from cdist.exec import util
+
+ CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
+
+--- a/cdist/exec/remote.py
++++ b/cdist/exec/remote.py
+@@ -27,7 +27,7 @@ import logging
+ import multiprocessing
+
+ import cdist
+-import cdist.exec.util as util
++from cdist.exec import util
+ import cdist.util.ipaddr as ipaddr
+ from cdist.mputil import mp_pool_run
+
+--- a/cdist/info.py
++++ b/cdist/info.py
+@@ -22,7 +22,7 @@
+ import cdist
+ import cdist.configuration
+ import cdist.core
+-import cdist.exec.util as util
++from cdist.exec import util
+ import os
+ import glob
+ import fnmatch
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/
@ 2020-12-28 15:50 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-12-28 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 24a06c8cac7c15de361b2c527946f241ae5f64ef
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:49:56 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:49:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a06c8c
app-admin/cdist: Cleanup old
Closes: https://github.com/gentoo/gentoo/pull/18741
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-admin/cdist/Manifest | 1 -
app-admin/cdist/cdist-6.9.2.ebuild | 29 ------------------
app-admin/cdist/files/cdist-6.9.2-tests.patch | 44 ---------------------------
3 files changed, 74 deletions(-)
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 9f91a60e262..d800a995554 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,2 +1 @@
-DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1
DIST cdist-6.9.3.tar.gz 1358492 BLAKE2B 04ec577629924b0a4356bfc44f0fbd3c7c8f0f15197b2fe8a62cde8e2089865a06c4d49366870be712bf0bc5d8f5c47f8c5ee3af602186ecef2c33e15af1b762 SHA512 3588cb7b98c78ff1671f1932474fd9c43e06ce075cfb0fa777903687f5ea84e7382da6014ea6230edad290de5175e3f000ea487831f1584b7efd4c97b8758dc2
diff --git a/app-admin/cdist/cdist-6.9.2.ebuild b/app-admin/cdist/cdist-6.9.2.ebuild
deleted file mode 100644
index 7b119c0cb7b..00000000000
--- a/app-admin/cdist/cdist-6.9.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
-
-# only required for py3.6 compatibility
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_prepare_all() {
- echo "VERSION='${PV}'" > cdist/version.py || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/app-admin/cdist/files/cdist-6.9.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch
deleted file mode 100644
index df99b74d9b8..00000000000
--- a/app-admin/cdist/files/cdist-6.9.2-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/cdist/preos.py
-+++ b/cdist/preos.py
-@@ -7,7 +7,7 @@ import cdist
- import logging
- import cdist.argparse
- import cdist.configuration
--import cdist.exec.util as util
-+from cdist.exec import util
-
-
- _PREOS_CALL = "commandline"
---- a/cdist/exec/local.py
-+++ b/cdist/exec/local.py
-@@ -34,7 +34,7 @@ import datetime
- import cdist
- import cdist.message
- from cdist import core
--import cdist.exec.util as util
-+from cdist.exec import util
-
- CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
-
---- a/cdist/exec/remote.py
-+++ b/cdist/exec/remote.py
-@@ -27,7 +27,7 @@ import logging
- import multiprocessing
-
- import cdist
--import cdist.exec.util as util
-+from cdist.exec import util
- import cdist.util.ipaddr as ipaddr
- from cdist.mputil import mp_pool_run
-
---- a/cdist/info.py
-+++ b/cdist/info.py
-@@ -22,7 +22,7 @@
- import cdist
- import cdist.configuration
- import cdist.core
--import cdist.exec.util as util
-+from cdist.exec import util
- import os
- import glob
- import fnmatch
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/
@ 2021-01-23 11:24 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-01-23 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 86d37a20dbc696723f22f0e4b80c3f661279bc23
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Jan 23 11:23:55 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 11:23:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d37a20
app-admin/cdist: Remove old
Closes: https://github.com/gentoo/gentoo/pull/19172
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-admin/cdist/Manifest | 1 -
app-admin/cdist/cdist-6.9.3.ebuild | 29 ------------------
app-admin/cdist/files/cdist-6.9.3-tests.patch | 44 ---------------------------
3 files changed, 74 deletions(-)
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 37892d3e044..25bd9dc06fb 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,2 +1 @@
-DIST cdist-6.9.3.tar.gz 1358492 BLAKE2B 04ec577629924b0a4356bfc44f0fbd3c7c8f0f15197b2fe8a62cde8e2089865a06c4d49366870be712bf0bc5d8f5c47f8c5ee3af602186ecef2c33e15af1b762 SHA512 3588cb7b98c78ff1671f1932474fd9c43e06ce075cfb0fa777903687f5ea84e7382da6014ea6230edad290de5175e3f000ea487831f1584b7efd4c97b8758dc2
DIST cdist-6.9.4.tar.gz 1362226 BLAKE2B c9f9c85b586718e8cd1fe1a88bed5603b0e1c4ddbf398caab033b3adacc056349edb44f9a597f6810a08fef0598260c350d307eafd16c7be43e556a586294800 SHA512 ba139ab404e8167530cc36461bf83443a3b7d289a4cd7daee2286e9610846ac0b75737899defe08dafa873d1c1b369f9a412c828c98c8aae9130713bf5a7ec77
diff --git a/app-admin/cdist/cdist-6.9.3.ebuild b/app-admin/cdist/cdist-6.9.3.ebuild
deleted file mode 100644
index 7b119c0cb7b..00000000000
--- a/app-admin/cdist/cdist-6.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
-
-# only required for py3.6 compatibility
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_prepare_all() {
- echo "VERSION='${PV}'" > cdist/version.py || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/app-admin/cdist/files/cdist-6.9.3-tests.patch b/app-admin/cdist/files/cdist-6.9.3-tests.patch
deleted file mode 100644
index df99b74d9b8..00000000000
--- a/app-admin/cdist/files/cdist-6.9.3-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/cdist/preos.py
-+++ b/cdist/preos.py
-@@ -7,7 +7,7 @@ import cdist
- import logging
- import cdist.argparse
- import cdist.configuration
--import cdist.exec.util as util
-+from cdist.exec import util
-
-
- _PREOS_CALL = "commandline"
---- a/cdist/exec/local.py
-+++ b/cdist/exec/local.py
-@@ -34,7 +34,7 @@ import datetime
- import cdist
- import cdist.message
- from cdist import core
--import cdist.exec.util as util
-+from cdist.exec import util
-
- CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
-
---- a/cdist/exec/remote.py
-+++ b/cdist/exec/remote.py
-@@ -27,7 +27,7 @@ import logging
- import multiprocessing
-
- import cdist
--import cdist.exec.util as util
-+from cdist.exec import util
- import cdist.util.ipaddr as ipaddr
- from cdist.mputil import mp_pool_run
-
---- a/cdist/info.py
-+++ b/cdist/info.py
-@@ -22,7 +22,7 @@
- import cdist
- import cdist.configuration
- import cdist.core
--import cdist.exec.util as util
-+from cdist.exec import util
- import os
- import glob
- import fnmatch
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/
@ 2022-01-18 11:30 Jakov Smolić
0 siblings, 0 replies; 5+ messages in thread
From: Jakov Smolić @ 2022-01-18 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 395c494e0cfba8e94ea03ff351cd0ae0aeca5fe0
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Mon Jan 17 20:34:12 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 11:29:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395c494e
app-admin/cdist: fix test
Closes: https://bugs.gentoo.org/831362
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Closes: https://github.com/gentoo/gentoo/pull/23846
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
app-admin/cdist/cdist-6.9.8.ebuild | 5 ++++-
app-admin/cdist/files/test.patch | 45 ++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild
index 1dae10c0230a..6b089e690af3 100644
--- a/app-admin/cdist/cdist-6.9.8.ebuild
+++ b/app-admin/cdist/cdist-6.9.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
+
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
@@ -17,6 +18,8 @@ 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
diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch
new file mode 100644
index 000000000000..98659344e9ea
--- /dev/null
+++ b/app-admin/cdist/files/test.patch
@@ -0,0 +1,45 @@
+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.
+
+ """
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/
@ 2024-05-28 15:27 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-05-28 15:27 UTC (permalink / raw
To: gentoo-commits
commit: af771f43d2e029fffa7da5e42931e74b4a6ed8a2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 15:25:28 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 28 15:27:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af771f43
app-admin/cdist: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-admin/cdist/Manifest | 1 -
app-admin/cdist/cdist-6.9.8.ebuild | 29 -----------------------
app-admin/cdist/files/test.patch | 47 --------------------------------------
3 files changed, 77 deletions(-)
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 7359503f6415..e7be92aa74f9 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,2 +1 @@
-DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b
DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7
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/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.
-
- """
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-28 15:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-28 15:50 [gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/, app-admin/cdist/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-05-28 15:27 Michał Górny
2022-01-18 11:30 Jakov Smolić
2021-01-23 11:24 David Seifert
2020-11-30 21:40 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox