[gentoo-commits] repo/gentoo:master commit in: app-admin/cdist/files/, app-admin/cdist/

[David Seifert]

commit:     3a72fa6bb7540e4dc64fa43f464c5a367433f31f
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:49:55 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:49:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a72fa6b

app-admin/cdist: Bump to 6.9.3

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 insertions(+)

diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 43073649cf5..9f91a60e262 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1 +1,2 @@
 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.3.ebuild b/app-admin/cdist/cdist-6.9.3.ebuild
new file mode 100644
index 00000000000..7b119c0cb7b
--- /dev/null
+++ b/app-admin/cdist/cdist-6.9.3.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.3-tests.patch b/app-admin/cdist/files/cdist-6.9.3-tests.patch
new file mode 100644
index 00000000000..df99b74d9b8
--- /dev/null
+++ b/app-admin/cdist/files/cdist-6.9.3-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