gentoo auto-resync : 25:02:2023 - 21:55:01

4 files changed, 47 insertions, 58 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index a46cd2f6a501..442d93f2a1a3 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,4 @@
-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
-EBUILD conan-1.53.0.ebuild 1744 BLAKE2B 79f4b38bc9b39672f3195fb5d79c3f0aa55d60e44fc98f5b77de75c20f75f5ed9dfa07efe3ff155731262072a5df61acff27837e047d660155fec94cef4347c6 SHA512 c57d706f1d1c74311b8081e967dc0f94a98df44b10298785f02c7cf2a01df7818b99fc2b8736797f9617f30fcd260bf5ff1f6c79f2f0be0615d6120cf571e70f
-EBUILD conan-1.54.0.ebuild 1778 BLAKE2B fd101dbb371299edfd39a9c175c4b6af50dcccb07718a930635322ebd5a430d889efc52737677fb8a24639f826f2ca27a734f5fc7d9eba054cea291c4e46d5b0 SHA512 f3d97b81eabed32441168ff047e7cead0c9ec9b506f73ffee62d775bb6ec22a60ec034542d12bd50d7039020cf97aedcecb573fd0f4ceff2c5c4d2500aa0c1b5
+AUX conan-1.59.0_nodesemver.patch 1511 BLAKE2B d2e6ac235c20b0a1d573ac82981616645baf7f9316ca31dee2719c3e60fd6a875d049064e89c6a9fa7c0612b830d0bf8281a87b7edccfb1b9ab1f6930c80de8b SHA512 e5ac706884722b0e22b39bd2421327dfb2da4e608a8eebb94d8a2a033ffd8101109858338447abb13247ba6c4b5b50764011be56679a4fbdd28b3842313f6796
+DIST conan-1.59.0.gh.tar.gz 1572455 BLAKE2B ab29fc6d86aca26271d8736185dbd7761984101e8489b57390a5073b680f4bffef957c4367030112acf8b2bf6e8ef867efd38eeece4081fe63d1f1f3ecf5b8c1 SHA512 101d00529a22623626ad0098539411c2411a1fd44d198b9d125c4c7d38527db6efb0a9eb5a9e77fd8d70436f9c4f60131458e3ca2c20c3385fcd32c20a4dd2db
+EBUILD conan-1.59.0.ebuild 1830 BLAKE2B 1ed2d192145c00d3cdfe5ffa29013f005a10ae6122943e834d492fbffa20bde77ce76298080bae18d491c43d7f737069bbff283ddb9f45d6a1a4124147f79314 SHA512 0775a177a47c1635ab9fe7d67a8e3b8905d312d411e1334d71d02ac61ed76a47d0ef228532fe715ddffb568998a1d449078cc8925cd37dd44f9b660efc15d56b
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.53.0.ebuild b/dev-util/conan/conan-1.53.0.ebuild
deleted file mode 100644
index f081b466f1f1..000000000000
--- a/dev-util/conan/conan-1.53.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.8[${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-1.4[${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"
-
-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/conan-1.54.0.ebuild b/dev-util/conan/conan-1.59.0.ebuild
index 4d835f1995cb..434460af9a91 100644
--- a/dev-util/conan/conan-1.54.0.ebuild
+++ b/dev-util/conan/conan-1.59.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=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.8[${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}]
@@ -44,6 +44,10 @@ RDEPEND="
 # versions and cannot be managable outside of a pure CI environment.
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${P}_nodesemver.patch"
+)
+
 src_prepare() {
 	default
 	# Fix strict dependencies
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
+