1 |
commit: f75063119d5cc0c0be8f2ff7cead52eb6d11fe2e |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Nov 30 21:39:33 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 30 21:39:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7506311 |
7 |
|
8 |
app-admin/cdist: bump to 6.9.2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/757351 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
app-admin/cdist/Manifest | 1 + |
16 |
app-admin/cdist/cdist-6.9.2.ebuild | 29 ++++++++++++++++++ |
17 |
app-admin/cdist/files/cdist-6.9.2-tests.patch | 44 +++++++++++++++++++++++++++ |
18 |
3 files changed, 74 insertions(+) |
19 |
|
20 |
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest |
21 |
index bc4b2680265..4ddefa33b7f 100644 |
22 |
--- a/app-admin/cdist/Manifest |
23 |
+++ b/app-admin/cdist/Manifest |
24 |
@@ -2,3 +2,4 @@ DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b |
25 |
DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792 |
26 |
DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e |
27 |
DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741 |
28 |
+DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1 |
29 |
|
30 |
diff --git a/app-admin/cdist/cdist-6.9.2.ebuild b/app-admin/cdist/cdist-6.9.2.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..7b119c0cb7b |
33 |
--- /dev/null |
34 |
+++ b/app-admin/cdist/cdist-6.9.2.ebuild |
35 |
@@ -0,0 +1,29 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+PYTHON_COMPAT=( python3_{6..9} ) |
42 |
+DISTUTILS_USE_SETUPTOOLS=no |
43 |
+ |
44 |
+inherit distutils-r1 |
45 |
+ |
46 |
+DESCRIPTION="A usable configuration management system" |
47 |
+HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" |
48 |
+SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/-/archive/${PV}/cdist-${PV}.tar.gz" |
49 |
+ |
50 |
+LICENSE="GPL-3+" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~x86" |
53 |
+ |
54 |
+distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme |
55 |
+distutils_enable_tests unittest |
56 |
+ |
57 |
+# only required for py3.6 compatibility |
58 |
+PATCHES=( "${FILESDIR}"/${P}-tests.patch ) |
59 |
+ |
60 |
+python_prepare_all() { |
61 |
+ echo "VERSION='${PV}'" > cdist/version.py || die |
62 |
+ |
63 |
+ distutils-r1_python_prepare_all |
64 |
+} |
65 |
|
66 |
diff --git a/app-admin/cdist/files/cdist-6.9.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch |
67 |
new file mode 100644 |
68 |
index 00000000000..df99b74d9b8 |
69 |
--- /dev/null |
70 |
+++ b/app-admin/cdist/files/cdist-6.9.2-tests.patch |
71 |
@@ -0,0 +1,44 @@ |
72 |
+--- a/cdist/preos.py |
73 |
++++ b/cdist/preos.py |
74 |
+@@ -7,7 +7,7 @@ import cdist |
75 |
+ import logging |
76 |
+ import cdist.argparse |
77 |
+ import cdist.configuration |
78 |
+-import cdist.exec.util as util |
79 |
++from cdist.exec import util |
80 |
+ |
81 |
+ |
82 |
+ _PREOS_CALL = "commandline" |
83 |
+--- a/cdist/exec/local.py |
84 |
++++ b/cdist/exec/local.py |
85 |
+@@ -34,7 +34,7 @@ import datetime |
86 |
+ import cdist |
87 |
+ import cdist.message |
88 |
+ from cdist import core |
89 |
+-import cdist.exec.util as util |
90 |
++from cdist.exec import util |
91 |
+ |
92 |
+ CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ] |
93 |
+ |
94 |
+--- a/cdist/exec/remote.py |
95 |
++++ b/cdist/exec/remote.py |
96 |
+@@ -27,7 +27,7 @@ import logging |
97 |
+ import multiprocessing |
98 |
+ |
99 |
+ import cdist |
100 |
+-import cdist.exec.util as util |
101 |
++from cdist.exec import util |
102 |
+ import cdist.util.ipaddr as ipaddr |
103 |
+ from cdist.mputil import mp_pool_run |
104 |
+ |
105 |
+--- a/cdist/info.py |
106 |
++++ b/cdist/info.py |
107 |
+@@ -22,7 +22,7 @@ |
108 |
+ import cdist |
109 |
+ import cdist.configuration |
110 |
+ import cdist.core |
111 |
+-import cdist.exec.util as util |
112 |
++from cdist.exec import util |
113 |
+ import os |
114 |
+ import glob |
115 |
+ import fnmatch |