gentoo auto-resync : 23:04:2023 - 18:08:08

4 files changed, 4 insertions, 104 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 1406922769ef..8b88f9e083c8 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,6 +1,3 @@
-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
-DIST conan-2.0.0.gh.tar.gz 884673 BLAKE2B 21872c34583a34efe3a64742b208f512e1b275ba2baea87e77e54173b7425ce2707c1fd1191ec3fab00552015a2b62a3013af3cda613a377a715d17e3ffce8fe SHA512 bd196e9960562519562ce32324664fe254e6e1248b19e89c69454984a8825691e869be2b5fc72373687ef3197a639cb13eda1a19f68a54716cb0dfd7cb313fa8
-EBUILD conan-1.59.0.ebuild 1830 BLAKE2B 1ed2d192145c00d3cdfe5ffa29013f005a10ae6122943e834d492fbffa20bde77ce76298080bae18d491c43d7f737069bbff283ddb9f45d6a1a4124147f79314 SHA512 0775a177a47c1635ab9fe7d67a8e3b8905d312d411e1334d71d02ac61ed76a47d0ef228532fe715ddffb568998a1d449078cc8925cd37dd44f9b660efc15d56b
-EBUILD conan-2.0.0.ebuild 1598 BLAKE2B 7af4a03a0652b56c1fb3d3c8e3fee2e767c7737ceb32969a7fca3021818515f671ddfa7eadc43b41bc4d82791725fd814fce274d508c652a34ef58c75d3b112f SHA512 2eb6880f070be2e96d158d24a0af74a28961752ac6ad0f739d2481a2ecafb5da30cd35620d966c2eb11a257f36058d3afd31f29d8f065be5f32e8d464b089483
+DIST conan-2.0.4.gh.tar.gz 918671 BLAKE2B 7a3d4f39b9e7f44a44fe498900c41657e8a9a7c3e700fbbdaa547b3679caf98627152e29fe50f272148184bd5ad8edcc7b0f79029c4728a3ef9f0128c5e31db6 SHA512 ff59b7dc6c0b4c33c09a338429054c2f9087e8b7147b21521f235263d0fca17ed69dc780cc0c65ed64fc8f67c5511362297e4252e1ca6046f872b91436d23908
+EBUILD conan-2.0.4.ebuild 1606 BLAKE2B 835cbd93fe37b1477552ab4c21d12d6b794a99964f3a5434a92de28480b9e86c54ce6e8d4d86bfce7a9f7e820537dadcd8b030a34e0dc5fb7cdd958479522c21 SHA512 5e542194dbf11a3ffb6ebdc0cb72e0e0ca55b509b75537c13d5660e5e644d9013a4fe758c5ebba7274df4295b1e643fab5b3a1eb20c30015158c4be9a88fb8a2
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.59.0.ebuild b/dev-util/conan/conan-1.59.0.ebuild
deleted file mode 100644
index 434460af9a91..000000000000
--- a/dev-util/conan/conan-1.59.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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/conan-2.0.0.ebuild b/dev-util/conan/conan-2.0.4.ebuild
index 17b10fd6095d..d44a558d8cec 100644
--- a/dev-util/conan/conan-2.0.0.ebuild
+++ b/dev-util/conan/conan-2.0.4.ebuild
@@ -18,8 +18,8 @@ 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
+# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements_server.txt
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-util/conan/files/conan-1.59.0_nodesemver.patch b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
deleted file mode 100644
index 4c914af6a63c..000000000000
--- a/dev-util/conan/files/conan-1.59.0_nodesemver.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-