From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Jan 2021 21:06:00 +0000
Subject: gentoo new year resync : 01.01.2021

---
 app-admin/cdist/Manifest                      |  6 ++--
 app-admin/cdist/cdist-6.9.2.ebuild            | 29 ------------------
 app-admin/cdist/cdist-6.9.3.ebuild            | 29 ++++++++++++++++++
 app-admin/cdist/files/cdist-6.9.2-tests.patch | 44 ---------------------------
 app-admin/cdist/files/cdist-6.9.3-tests.patch | 44 +++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100644 app-admin/cdist/cdist-6.9.2.ebuild
 create mode 100644 app-admin/cdist/cdist-6.9.3.ebuild
 delete mode 100644 app-admin/cdist/files/cdist-6.9.2-tests.patch
 create mode 100644 app-admin/cdist/files/cdist-6.9.3-tests.patch

(limited to 'app-admin/cdist')

diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 6ec2bfff3cb7..2c10d413b187 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,4 +1,4 @@
-AUX cdist-6.9.2-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
-DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1
-EBUILD cdist-6.9.2.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
+AUX cdist-6.9.3-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
+DIST cdist-6.9.3.tar.gz 1358492 BLAKE2B 04ec577629924b0a4356bfc44f0fbd3c7c8f0f15197b2fe8a62cde8e2089865a06c4d49366870be712bf0bc5d8f5c47f8c5ee3af602186ecef2c33e15af1b762 SHA512 3588cb7b98c78ff1671f1932474fd9c43e06ce075cfb0fa777903687f5ea84e7382da6014ea6230edad290de5175e3f000ea487831f1584b7efd4c97b8758dc2
+EBUILD cdist-6.9.3.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
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 7b119c0cb7b3..000000000000
--- 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/cdist-6.9.3.ebuild b/app-admin/cdist/cdist-6.9.3.ebuild
new file mode 100644
index 000000000000..7b119c0cb7b3
--- /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.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch
deleted file mode 100644
index df99b74d9b81..000000000000
--- 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
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 000000000000..df99b74d9b81
--- /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
-- 
cgit v1.2.3