1 |
commit: 800b306d2e44cdcb6b1a9d6aa70b1461fbffade8 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Apr 21 22:07:32 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 07:41:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=800b306d |
7 |
|
8 |
dev-util/conan: update to 1.14.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/717512 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/15464 |
14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
15 |
|
16 |
dev-util/conan/Manifest | 1 + |
17 |
dev-util/conan/conan-1.24.1.ebuild | 73 ++++++++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 74 insertions(+) |
19 |
|
20 |
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest |
21 |
index 9b5c7e350bc..3d3c0a1e9d4 100644 |
22 |
--- a/dev-util/conan/Manifest |
23 |
+++ b/dev-util/conan/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8 |
26 |
+DIST conan-1.24.1.tar.gz 1043698 BLAKE2B 33e5aaa975a9819d0808c90ad97260b00aab6f4ae8ba6feb7d2c53622f0e72b87cc469c7c21994e2c228819bd364dc9b20822134c10665978bf996b653c014b9 SHA512 ab6e15c4291862d9d68661682ec9da8c126193ddb00b800e3d8f9dba07a516db307d22e590324ae3f059e39e897bc6bf590e53cc82d69431ce287031be7fe820 |
27 |
|
28 |
diff --git a/dev-util/conan/conan-1.24.1.ebuild b/dev-util/conan/conan-1.24.1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..5cedb0a5c46 |
31 |
--- /dev/null |
32 |
+++ b/dev-util/conan/conan-1.24.1.ebuild |
33 |
@@ -0,0 +1,73 @@ |
34 |
+# Copyright 1999-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+PYTHON_COMPAT=( python3_{6,7} ) |
40 |
+PYTHON_REQ_USE="sqlite" |
41 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
42 |
+inherit distutils-r1 |
43 |
+ |
44 |
+DESCRIPTION="Distributed C/C++ package manager" |
45 |
+HOMEPAGE="https://conan.io/" |
46 |
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="MIT" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
51 |
+ |
52 |
+# overly strict requirements? |
53 |
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt |
54 |
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt |
55 |
+RDEPEND=" |
56 |
+ >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/deprecation-2.0[${PYTHON_USEDEP}] |
59 |
+ >=dev-python/distro-1.0.2[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/future-0.16.0[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/pyjwt-1.4[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] |
69 |
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
70 |
+ >=dev-python/requests-2.8.1[${PYTHON_USEDEP}] |
71 |
+ >=dev-python/six-1.12.0[${PYTHON_USEDEP}] |
72 |
+ >=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}] |
73 |
+" |
74 |
+ |
75 |
+distutils_enable_tests nose |
76 |
+DEPEND+=" |
77 |
+ test? ( |
78 |
+ dev-lang/go |
79 |
+ dev-vcs/git |
80 |
+ dev-vcs/subversion |
81 |
+ >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
82 |
+ >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] |
83 |
+ >=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}] |
84 |
+ >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}] |
85 |
+ dev-util/cmake |
86 |
+ ) |
87 |
+" |
88 |
+ |
89 |
+src_prepare() { |
90 |
+ default |
91 |
+ # Fix strict dependencies |
92 |
+ sed -i \ |
93 |
+ -e "s:six>=1.10.0,<1.14.0:six>=1.12.0:g" \ |
94 |
+ -e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \ |
95 |
+ conans/requirements.txt || die |
96 |
+} |
97 |
+ |
98 |
+python_test() { |
99 |
+ nosetests -v conans.test \ |
100 |
+ -e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \ |
101 |
+ -e rpath_optin_test -e test_variables -e system_package_tool_installed_test \ |
102 |
+ -e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \ |
103 |
+ -e test_environment_nested -e devflow_test -e shared_chain_test \ |
104 |
+ -e virtualenv_test \ |
105 |
+ -A "not rest_api and not local_bottle" || die |
106 |
+} |