diff options
Diffstat (limited to 'app-admin/cdist')
-rw-r--r-- | app-admin/cdist/Manifest | 3 | ||||
-rw-r--r-- | app-admin/cdist/cdist-6.9.8.ebuild (renamed from app-admin/cdist/cdist-6.9.4.ebuild) | 17 | ||||
-rw-r--r-- | app-admin/cdist/cdist-7.0.0.ebuild | 27 | ||||
-rw-r--r-- | app-admin/cdist/files/test.patch | 47 | ||||
-rw-r--r-- | app-admin/cdist/metadata.xml | 8 |
5 files changed, 90 insertions, 12 deletions
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest index 25bd9dc06fb0..7359503f6415 100644 --- a/app-admin/cdist/Manifest +++ b/app-admin/cdist/Manifest @@ -1 +1,2 @@ -DIST cdist-6.9.4.tar.gz 1362226 BLAKE2B c9f9c85b586718e8cd1fe1a88bed5603b0e1c4ddbf398caab033b3adacc056349edb44f9a597f6810a08fef0598260c350d307eafd16c7be43e556a586294800 SHA512 ba139ab404e8167530cc36461bf83443a3b7d289a4cd7daee2286e9610846ac0b75737899defe08dafa873d1c1b369f9a412c828c98c8aae9130713bf5a7ec77 +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.4.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild index 7fb25712179a..4e75b661c296 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-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +PYTHON_COMPAT=( python3_{9..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" -distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme +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/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0.ebuild new file mode 100644 index 000000000000..074a43f466ea --- /dev/null +++ b/app-admin/cdist/cdist-7.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +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 ~ppc64 ~x86" + +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 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> |