diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
| commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
| tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /app-admin/cdist | |
| parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) | |
gentoo resync : 29.01.2021
Diffstat (limited to 'app-admin/cdist')
| -rw-r--r-- | app-admin/cdist/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/cdist/cdist-6.9.4.ebuild (renamed from app-admin/cdist/cdist-6.9.3.ebuild) | 7 | ||||
| -rw-r--r-- | app-admin/cdist/files/cdist-6.9.3-tests.patch | 44 |
3 files changed, 4 insertions, 52 deletions
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest index 2c10d413b187..34a923acb091 100644 --- a/app-admin/cdist/Manifest +++ b/app-admin/cdist/Manifest @@ -1,4 +1,3 @@ -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 +DIST cdist-6.9.4.tar.gz 1362226 BLAKE2B c9f9c85b586718e8cd1fe1a88bed5603b0e1c4ddbf398caab033b3adacc056349edb44f9a597f6810a08fef0598260c350d307eafd16c7be43e556a586294800 SHA512 ba139ab404e8167530cc36461bf83443a3b7d289a4cd7daee2286e9610846ac0b75737899defe08dafa873d1c1b369f9a412c828c98c8aae9130713bf5a7ec77 +EBUILD cdist-6.9.4.ebuild 676 BLAKE2B 814139667be230ac57a8bf7b307a2f30852e7d3a99312d999851132685562ce643d98174ab6212a4d5933c9a03092ed12eeea8c9f96f92b33d42587caa102bdb SHA512 2d11bd2b4b02ba258971be997b59eed7966573ac221a9981efba4b49c9af06353579105648075d80f5bc28f7e0756e197755523bf4f1f9bf9584db5755c02dc9 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c diff --git a/app-admin/cdist/cdist-6.9.3.ebuild b/app-admin/cdist/cdist-6.9.4.ebuild index 7b119c0cb7b3..7fb25712179a 100644 --- a/app-admin/cdist/cdist-6.9.3.ebuild +++ b/app-admin/cdist/cdist-6.9.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 @@ -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 |