3 files changed, 2 insertions, 49 deletions
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index d800a995554d..25bd9dc06fb0 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1 +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.4.ebuild
index b02a18ec6290..624fa8e76a11 100644
--- a/app-admin/cdist/cdist-6.9.3.ebuild
+++ b/app-admin/cdist/cdist-6.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,9 +19,6 @@ 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
 
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 df99b74d9b81..000000000000
--- 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