gentoo auto-resync : 11:11:2022 - 21:30:43

5 files changed, 58 insertions, 3 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 30afcde648db..8bdaa7a09b95 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index af2007ed144d..73459eecb8f5 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,7 @@
 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
+EBUILD conan-1.53.0.ebuild 1744 BLAKE2B 5d30664d6a3c45c1b5d8b55e5ea57c4a5b17a24cf36166db6c9e722c2fb8dee73b47ce12bc13425307e52c1a76d686a9429ea1264578be0997147c85a3a4f7da SHA512 94c83078ef26dbc951ef132df2d10ecef6028127ff2115700b5b23a3f02b386ba4ee8e64a692bae606c5caf27b7292583bc12feae79dc1098017a40f513c37ce
 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
new file mode 100644
index 000000000000..76ce0a9a124f
--- /dev/null
+++ b/dev-util/conan/conan-1.53.0.ebuild
@@ -0,0 +1,53 @@
+# 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}.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/lldb/Manifest b/dev-util/lldb/Manifest
index 0d5e0ff20e39..d7b69c56c1e5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -12,6 +12,6 @@ EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b342
 EBUILD lldb-15.0.3.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
 EBUILD lldb-15.0.4.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.4.ebuild 2743 BLAKE2B c95d3acc30db1537fec7bd23a297db41f1e190862d93b12a1d4e107e372a22e721939726fb9596e34040a4c228d86ebec6805d09111f6e4c6793865826526439 SHA512 9794c7774b79227349e49eb1d311832f02f870c9c4bfb02f78941fb5497d37a865ae38d9a050e920a354a3dff756559e8e91cf67265dd58c451a21db82a0aee9
-EBUILD lldb-16.0.0.9999.ebuild 2654 BLAKE2B 1723b2b67b751dacb4c25d53f312d4f0ef381261640a1a488ed888a0c0692b6dac147f343f59ea63501e4758d323f05687c0cc033a5850caecd7f50c7a92af23 SHA512 f13b642ea83f536b7b0712a7757defbf629b1962438c8352cd15ed81d65ce4a5a5aa4117cbfff1b429da1fabe4e6db26e16fd851923f451da77bb9d64dff764c
+EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221104.ebuild 2654 BLAKE2B 1723b2b67b751dacb4c25d53f312d4f0ef381261640a1a488ed888a0c0692b6dac147f343f59ea63501e4758d323f05687c0cc033a5850caecd7f50c7a92af23 SHA512 f13b642ea83f536b7b0712a7757defbf629b1962438c8352cd15ed81d65ce4a5a5aa4117cbfff1b429da1fabe4e6db26e16fd851923f451da77bb9d64dff764c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0.9999.ebuild b/dev-util/lldb/lldb-16.0.0.9999.ebuild
index 0f7dd9d5c5be..ee34e2696fe0 100644
--- a/dev-util/lldb/lldb-16.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.0.9999.ebuild
@@ -52,7 +52,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
 pkg_setup() {
@@ -87,7 +87,7 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DPython3_EXECUTABLE="${PYTHON}"