commit: 197d9966bce16697e0b2c181fb7950641a3af37d
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Feb 2 08:05:24 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 17:25:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197d9966
dev-util/conan: add 1.59.0
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-util/conan/Manifest | 1 +
dev-util/conan/conan-1.59.0.ebuild | 58 ++++++++++++++++++++++
dev-util/conan/files/conan-1.59.0_nodesemver.patch | 39 +++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 09731da66f75..c109b7bc4d29 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,2 +1,3 @@
DIST conan-1.53.0.gh.tar.gz 1540050 BLAKE2B
f3ce976566be427d5bec68ce7dd79a6236c4c5860f39fe5aed4077690061d9c671063575cab407b0aeecae1c47a12bae0126341014fba66f187d4c969fb8f3f3
SHA512
ec2e445c5e097459aabea62e2d77906614cbba8b3edcecc14b7ecc7205de3bac8027362580eb4c68f3a7d708a302ecef0f6d09d2b80db9aa6e4884ccec836fb2
DIST conan-1.54.0.gh.tar.gz 1547224 BLAKE2B
7638304e99470487fc6733e223352c2f372d47cc3c5ca4349f5ce731374831ba490f3c6aa73c2e2a02bca60d8e8797e26b43c85d07c40f0b60b6b3c22d9dc1e8
SHA512
bfe5a0c023c939ce552a6b3d8578c794aa2c58790d3b2816355358a95d8931b46353172e690df482c94a3ed37f7abeb5b94f91ddf3bb7756be3a58338e501c05
+DIST conan-1.59.0.gh.tar.gz 1572455 BLAKE2B
ab29fc6d86aca26271d8736185dbd7761984101e8489b57390a5073b680f4bffef957c4367030112acf8b2bf6e8ef867efd38eeece4081fe63d1f1f3ecf5b8c1
SHA512
101d00529a22623626ad0098539411c2411a1fd44d198b9d125c4c7d38527db6efb0a9eb5a9e77fd8d70436f9c4f60131458e3ca2c20c3385fcd32c20a4dd2db
diff --git a/dev-util/conan/conan-1.59.0.ebuild
b/dev-util/conan/conan-1.59.0.ebuild
new file mode 100644
index 000000000000..434460af9a91
--- /dev/null
+++ b/dev-util/conan/conan-1.59.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/";
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz ->
${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+ >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ >=dev-python/node-semver-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+ >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.25[${PYTHON_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+ >=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
+"
+
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}_nodesemver.patch"
+)
+
+src_prepare() {
+ default
+ # Fix strict dependencies
+ sed -i \
+ -e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+ -e 's:==:>=:g' \
+ conans/requirements{,_server}.txt || die
+}
diff --git a/dev-util/conan/files/conan-1.59.0_nodesemver.patch
b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
new file mode 100644
index 000000000000..4c914af6a63c
--- /dev/null
+++ b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
@@ -0,0 +1,39 @@
+diff --git a/conans/client/conf/required_version.py
b/conans/client/conf/required_version.py
+index f06342d66..f1f62d3c7 100644
+--- a/conans/client/conf/required_version.py
++++ b/conans/client/conf/required_version.py
+@@ -1,7 +1,7 @@
+ import six
+
+ from conans.client.cache.cache import ClientCache
+-from semver import satisfies
++from nodesemver import satisfies
+ from conans import __version__ as client_version
+ from conans.errors import ConanException
+
+diff --git a/conans/client/graph/range_resolver.py
b/conans/client/graph/range_resolver.py
+index 616585967..856fb25da 100644
+--- a/conans/client/graph/range_resolver.py
++++ b/conans/client/graph/range_resolver.py
+@@ -56,7 +56,7 @@ def satisfying(list_versions, versionexpr, result):
+ if some version cannot be converted to loose SemVer, it is discarded with
a msg
+ This provides some workaround for failing comparisons like "2.1" not
matching "<=2.1"
+ """
+- from semver import SemVer, Range, max_satisfying
++ from nodesemver import SemVer, Range, max_satisfying
+ version_range, loose, include_prerelease =
_parse_versionexpr(versionexpr, result)
+
+ # Check version range expression
+diff --git a/conans/client/tools/version.py b/conans/client/tools/version.py
+index c6518302c..4c2206124 100644
+--- a/conans/client/tools/version.py
++++ b/conans/client/tools/version.py
+@@ -2,7 +2,7 @@
+
+ from functools import total_ordering
+
+-from semver import SemVer
++from nodesemver import SemVer
+
+ from conans.errors import ConanException
+
