gentoo auto-resync : 22:11:2022 - 19:06:54

3 files changed, 5 insertions, 59 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 73459eecb8f5..f3ba0cc12aa0 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,7 +1,5 @@
-DIST conan-1.47.0.tar.gz 1478478 BLAKE2B 1d97d5f9b4ce4ea850a335f625997d2785943553fad71954097cd8c59db095739850064425d4dc675ad35967149b16967d2c459ab99169704c3664a68da66e8d SHA512 16009a611138ed44c85cce29ab16448433bde850bea0f985a8969c55ab8fa696029b59e501a77e0bac6c433237aa90d77a6ba85b19fb4fc0dab5fe4a08e898c6
-DIST conan-1.48.0.tar.gz 1494486 BLAKE2B ef7aeeada788df95598ee222833ffa976a10ba0c9f69d58131be0145f5f57d4dec5cf1e9c89cff8f73e351820cd8ed0f93dd5e0d5901d1356c54aec2a2a2c32e SHA512 92b7797e0e67dcfaef9c0c87304ae46f1c39618fc42c4758b7f810fbd4e3c0f54396009981a6f816982bd8296613f9ef4b1b042bab7d8e3a4737db7423dd0e1c
 DIST conan-1.53.0.gh.tar.gz 1540050 BLAKE2B f3ce976566be427d5bec68ce7dd79a6236c4c5860f39fe5aed4077690061d9c671063575cab407b0aeecae1c47a12bae0126341014fba66f187d4c969fb8f3f3 SHA512 ec2e445c5e097459aabea62e2d77906614cbba8b3edcecc14b7ecc7205de3bac8027362580eb4c68f3a7d708a302ecef0f6d09d2b80db9aa6e4884ccec836fb2
-EBUILD conan-1.47.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
-EBUILD conan-1.48.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
+DIST conan-1.54.0.gh.tar.gz 1547224 BLAKE2B 7638304e99470487fc6733e223352c2f372d47cc3c5ca4349f5ce731374831ba490f3c6aa73c2e2a02bca60d8e8797e26b43c85d07c40f0b60b6b3c22d9dc1e8 SHA512 bfe5a0c023c939ce552a6b3d8578c794aa2c58790d3b2816355358a95d8931b46353172e690df482c94a3ed37f7abeb5b94f91ddf3bb7756be3a58338e501c05
 EBUILD conan-1.53.0.ebuild 1744 BLAKE2B 5d30664d6a3c45c1b5d8b55e5ea57c4a5b17a24cf36166db6c9e722c2fb8dee73b47ce12bc13425307e52c1a76d686a9429ea1264578be0997147c85a3a4f7da SHA512 94c83078ef26dbc951ef132df2d10ecef6028127ff2115700b5b23a3f02b386ba4ee8e64a692bae606c5caf27b7292583bc12feae79dc1098017a40f513c37ce
+EBUILD conan-1.54.0.ebuild 1778 BLAKE2B 63bdd0fc3cbcf17b44ce0267719bac5d94ca256ca0f60375411b31de7d2191289423a7810e0c7b9457ceb534f2fecc9b3caa2834e3ef67cac5271381d0c0e3ac SHA512 7155f270b84233eac62f78373a528c6eb18017baf063650c02ed769be5b498b040fc05cce497fe2ebdf1f4288abad2471b2011cf1678f734a30828f1cbb37883
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.48.0.ebuild b/dev-util/conan/conan-1.48.0.ebuild
deleted file mode 100644
index 4f0904287fad..000000000000
--- a/dev-util/conan/conan-1.48.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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}.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.47.0.ebuild b/dev-util/conan/conan-1.54.0.ebuild
index 4f0904287fad..362e957b692f 100644
--- a/dev-util/conan/conan-1.47.0.ebuild
+++ b/dev-util/conan/conan-1.54.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
@@ -10,7 +11,7 @@ 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}.tar.gz"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -29,7 +30,7 @@ RDEPEND="
 	>=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/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}]