gentoo resync : 29.12.2022

3 files changed, 3 insertions, 58 deletions

diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 97b2370e7672..af2007ed144d 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,7 +1,5 @@
-DIST conan-1.42.0.tar.gz 1399488 BLAKE2B f0297ad74bdb47d1240641a0f6bd5f343a0a8f5723f554dffd2f7da969e3ee58cc97c3bb187f1586eb6ad4377106648c70fc4fd2672744639ffc940e5f4de316 SHA512 cd982f95e8bac5f66be16a326fc34d3db014b6a21138a10a7e92d6debfc578413c4d9737f371130b01ae35b14c82c0f11c2a09dc74e4d913a189d9cc34446d93
-DIST conan-1.44.0.tar.gz 1415330 BLAKE2B e08370f3035d13a752107ae6ba5e941aefcdc27f89515c192de11ebdd2dd5869392143fd72104cee9b644c258253b0a50a52715265eff9f10c0569299012aba5 SHA512 607d63c4e133543edccd3ef8c275f98ec8fad1e20061f7000a5b1f1129464b66fd88d3c8cc0773d51b725eb6b7f8d75c2b342a97481cf54dbdd44e2ff23b9cde
 DIST conan-1.47.0.tar.gz 1478478 BLAKE2B 1d97d5f9b4ce4ea850a335f625997d2785943553fad71954097cd8c59db095739850064425d4dc675ad35967149b16967d2c459ab99169704c3664a68da66e8d SHA512 16009a611138ed44c85cce29ab16448433bde850bea0f985a8969c55ab8fa696029b59e501a77e0bac6c433237aa90d77a6ba85b19fb4fc0dab5fe4a08e898c6
-EBUILD conan-1.42.0.ebuild 1744 BLAKE2B 835a9ad149b094c93d3415427987207c561ce906739df90264d40320fe09763eb1833514fb909b59dae6718fb43a4343f769feafeaeb355aaf79e1178dcccf21 SHA512 0151f774cf76a1078ac1de9d236b41e848605f5003067885e5eed26a43337ad84cf4bd69d8a6004db0cb9f4225d7cf5fb7cbdc93ca45dc2cc4ca3b76ebb1b840
-EBUILD conan-1.44.0.ebuild 1744 BLAKE2B 768f154154ce7b892b704fc35362f55a08c8a83018f326bcfd9e369b764263c9e21a1f75b81b2005cb1026eab05c33e84638a00d96b9a20040d8a39e8f7e5656 SHA512 e1dc7588e4136652f8639dc3d52414ac6125dee97d6ccf5b822ce6e68b0ab8b793b9570e0eab71f4ac5df638f2c1ec217568a26d34abfc20c4fc1290dbba5b73
+DIST conan-1.48.0.tar.gz 1494486 BLAKE2B ef7aeeada788df95598ee222833ffa976a10ba0c9f69d58131be0145f5f57d4dec5cf1e9c89cff8f73e351820cd8ed0f93dd5e0d5901d1356c54aec2a2a2c32e SHA512 92b7797e0e67dcfaef9c0c87304ae46f1c39618fc42c4758b7f810fbd4e3c0f54396009981a6f816982bd8296613f9ef4b1b042bab7d8e3a4737db7423dd0e1c
 EBUILD conan-1.47.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
+EBUILD conan-1.48.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.42.0.ebuild b/dev-util/conan/conan-1.42.0.ebuild
deleted file mode 100644
index 4ea924b09769..000000000000
--- a/dev-util/conan/conan-1.42.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..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-2.10.1[${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.44.0.ebuild b/dev-util/conan/conan-1.48.0.ebuild
index 6d56c02f673b..4f0904287fad 100644
--- a/dev-util/conan/conan-1.44.0.ebuild
+++ b/dev-util/conan/conan-1.48.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=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-2.10.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}]