7 files changed, 76 insertions, 106 deletions
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 635360cc03bb..6ec2bfff3cb7 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,9 +1,4 @@
-DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
-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
-EBUILD cdist-5.1.3.ebuild 590 BLAKE2B c587b9ffe196b672e600f80c521138e46c838ab3c2c93165299fe58037957c93e4a9fed227705583ae877444d76b81d466827e283af24845127de848594b6308 SHA512 64de373a0834108dcdbed4ad81b6747aa14ef5c568b341ca8056c4d7eb369cabb543d02d252b5cd3c89832fc9a5b1192640072e47594ef2d9c5312e1e6d6d60d
-EBUILD cdist-6.0.0.ebuild 596 BLAKE2B fac03ebac640f9a3c0675bf239849276005d9374c144cfd342bff70bec164883dc3b7aa5c820d28abff14f0a48c7d49380cb2940758cac0b49afa0f0853db3b1 SHA512 265a2362ccd5bbbce39d85b975a0a938b15e790394ae3cbabbbe6244a9e7c65db6248205484927627bc13c6e7bbb3e54efe35c9a7c801d00c4469ead0b4547ca
-EBUILD cdist-6.5.4.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
-EBUILD cdist-6.5.6.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
+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
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
diff --git a/app-admin/cdist/cdist-5.1.3.ebuild b/app-admin/cdist/cdist-5.1.3.ebuild
deleted file mode 100644
index bb88eabb6012..000000000000
--- a/app-admin/cdist/cdist-5.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.0.0.ebuild b/app-admin/cdist/cdist-6.0.0.ebuild
deleted file mode 100644
index d88a8c2d5ebe..000000000000
--- a/app-admin/cdist/cdist-6.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.5.4.ebuild b/app-admin/cdist/cdist-6.5.4.ebuild
deleted file mode 100644
index ed4bd09b8c98..000000000000
--- a/app-admin/cdist/cdist-6.5.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.5.6.ebuild b/app-admin/cdist/cdist-6.5.6.ebuild
deleted file mode 100644
index ed4bd09b8c98..000000000000
--- a/app-admin/cdist/cdist-6.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
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 000000000000..7b119c0cb7b3
--- /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 000000000000..df99b74d9b81
--- /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