commit: 0ad827ea7dfda4b99d14405886b06db86ea30daf Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Thu Apr 20 19:26:37 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Apr 23 15:47:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad827ea
dev-util/conan: drop 1.59.0, 2.0.0 Closes: https://bugs.gentoo.org/903195 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/30672 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/conan/Manifest | 2 - dev-util/conan/conan-1.59.0.ebuild | 58 ---------------------- dev-util/conan/conan-2.0.0.ebuild | 50 ------------------- dev-util/conan/files/conan-1.59.0_nodesemver.patch | 39 --------------- 4 files changed, 149 deletions(-) diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest index a936bfb1b6c1..2bb889deb633 100644 --- a/dev-util/conan/Manifest +++ b/dev-util/conan/Manifest @@ -1,3 +1 @@ -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 DIST conan-2.0.4.gh.tar.gz 918671 BLAKE2B 7a3d4f39b9e7f44a44fe498900c41657e8a9a7c3e700fbbdaa547b3679caf98627152e29fe50f272148184bd5ad8edcc7b0f79029c4728a3ef9f0128c5e31db6 SHA512 ff59b7dc6c0b4c33c09a338429054c2f9087e8b7147b21521f235263d0fca17ed69dc780cc0c65ed64fc8f67c5511362297e4252e1ca6046f872b91436d23908 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.0.ebuild deleted file mode 100644 index 17b10fd6095d..000000000000 --- a/dev-util/conan/conan-2.0.0.ebuild +++ /dev/null @@ -1,50 +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..11} ) -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.4.3[${PYTHON_USEDEP}] - >=dev-python/distro-1.4.0[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0[${PYTHON_USEDEP}] - >=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}] - >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}] - >=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] - >=dev-python/requests-2.25[${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/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 -
