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

8 files changed, 214 insertions, 59 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bc46e4058ec5..f1259685cc1d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 9f3d97e566a5..552edb796137 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -5,8 +5,10 @@ DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302
 DIST bazel-4.2.2-dist.zip 279304631 BLAKE2B 2a32838e50b63c4b6400aced10085c6c9aacf28641ea555a44b9c4ed8991fc29658b4d420b26179e8eed0e00cfe7391e8eec84c7851f17493c74d1c5682427af SHA512 123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db
 DIST bazel-5.0.0-dist.zip 235894565 BLAKE2B 3798eb9111772809f0345e0c74bef38d8f9d44a7f20844f20aad187a2e177f4999ffa0e1cc1719e4284cdc7c72295bb903d32ce56821c72ee2908f4d939d0769 SHA512 2a9a972d1cce6b50f959fec3d37506914208169c8aa36e5ec5f9a27942e9beff1080a544a18e9bd5eb13dc434c1864cda0594e6da5b78c2f41085abf808c22d7
 DIST bazel-5.1.1-dist.zip 236073335 BLAKE2B dacc98db99a4877bcda743058f8d34c276d893bec14a595155587f9d0a2716caf106e1d08917f8103b9c15c45433285cce2063f15a2653d3d1a4a6b67242876f SHA512 84e2f72df1838fc88a39853afc510bca835fea28590e9aac2138b5416d2f8d9aefd082c81012a2066194fdc440b00b44f9f188b5c896461acebfeb9cd40efc7c
+DIST bazel-5.3.0-dist.zip 235314819 BLAKE2B 771a940e083d569b0297d37877e6d52c16f698bc5141e2c9c895d5d6cdd9e93203fbc941eca7daa4b40026551c25a5bf45d0862b8b13993bc40434aa6bb99dd3 SHA512 6c98e904596764a309e98ea2453c751dc0bf27c683462c5654b72076f8537bccf6c5103ccea60fa3a3dffeaa76b07db80a594feb96ed566282d10bb04f0e1455
 EBUILD bazel-3.7.2-r1.ebuild 2778 BLAKE2B d24848fe0b5d5cc71cc754e1f7f6e2d5efc14240c55b00af10b93de298646f0bed8994a69a2767986854f4784dfc820e5dd157ef253325049d4c039b3b79bcf7 SHA512 08d18de4c56f733d638c36317c66a7d2afa6b7dde03ca79c106e0285551514ea9558c68c2c13dd33e6448d8d38d233fff423bde434714345c711ee955ca75f98
 EBUILD bazel-4.2.2.ebuild 2368 BLAKE2B 51982c8c7ac6d2d02259c295879a1883f45e83203c8a8ae697697b593dbb5ce7649ee3054ccf624416eba0fae51f942a115c275fbd6d173c6168324a289d933a SHA512 a58e9e1b9df0257806d64df2527d25eea261974de747237b478a009974c492b8f7c414a598029162bf689c6cfe7082660730d72b6d8f78a4620b16d820a885fc
 EBUILD bazel-5.0.0.ebuild 2387 BLAKE2B d178d0ae8503b118b307689c3923e5ea859f3c961b01b4c08453e5efe48e9468feee555a47aaad0fe04b645395212935867c18a66cd59369f21b63b1f46cae44 SHA512 aaab839c67430c578a1b9d1de59013b75f29a40bae902a799428726da49c716534c6fa4e400362793816d8c6dc56b2e7dad68b1e673b85928b950b2fa50d9b28
 EBUILD bazel-5.1.1.ebuild 2388 BLAKE2B c6ed6fa24af8f9c0a6ac5a6e841926c34201aba47d035c9b344db62faaf9062a8aa05a537dd73b33ff03b168a66da24b081d181585bf18c81d7ce3b204643ab0 SHA512 e334a3366e452bcb4f846bf5379027287a4432621729bf37240425266facf01ee198be74915842db1d524c7c34620b67eadbf08f81b40fae89f1f476c21821f9
+EBUILD bazel-5.3.0.ebuild 2388 BLAKE2B c6ed6fa24af8f9c0a6ac5a6e841926c34201aba47d035c9b344db62faaf9062a8aa05a537dd73b33ff03b168a66da24b081d181585bf18c81d7ce3b204643ab0 SHA512 e334a3366e452bcb4f846bf5379027287a4432621729bf37240425266facf01ee198be74915842db1d524c7c34620b67eadbf08f81b40fae89f1f476c21821f9
 MISC metadata.xml 706 BLAKE2B 07f70164b2e809db66f4255b62635e1b93ff58269f323a0efbfd994dd425034e4896599463c900582f0863cebf8f5ee0dd56da01bafbd30c9e27e88ffb99ad46 SHA512 3a335159533ca5f0d7de3b1bde18a737ba2dca2de56121124cdb9cb05009db5fac07bef1d21d5b73bec834b7928e7ec291e2ff3cd964e395431b9deac29bfbe6
diff --git a/dev-util/bazel/bazel-5.3.0.ebuild b/dev-util/bazel/bazel-5.3.0.ebuild
new file mode 100644
index 000000000000..36ee3e954ac0
--- /dev/null
+++ b/dev-util/bazel/bazel-5.3.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 bazel java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jre-11:*"
+DEPEND="
+	virtual/jdk:11
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if has ccache ${FEATURES}; then
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags)
+		--java_runtime_version=local_jdk
+		--tool_java_runtime_version=local_jdk"
+	VERBOSE=yes ./compile.sh || die "Failed compiling bazel"
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions"
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 0d528404b032..d6339ad4f18c 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,7 @@
 DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
 DIST CLion-2022.2.1.tar.gz 893465319 BLAKE2B c60242c3912b7fbda601e06f6191162da42e3255ed8a3b8eeeab0d910f0d2aac767fa9bc9a4096114c2110f9104604d7294f2e97c4d67004f1c234040d45a6f3 SHA512 b48d8ef74b19e9ba1b75fc9c01ab052a2fbe0a7c1eab086fc0ab9551eabdcb878e478a6c7793bd2bc455453425313b2caa8e884f5ef0a6468ca73fa3877bf892
+DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
 EBUILD clion-2022.1.3-r1.ebuild 2962 BLAKE2B cf320a340c3de6bf4b949faad24ef89976e1395c743f28f7adbb63446960cd9426d4c7290aa36216c02a85c958400b6bf9ce7cba257599f6d285eadb75b15fb6 SHA512 8fbf9ca8b1d7315f225470d83942e28ddfa41b235cb27b14222e8669c2b355170f884573f319fb5246b024d6e4d4d2cf24d513c7ff5d9b2b38a4ecf557b8836c
 EBUILD clion-2022.2.1-r2.ebuild 2980 BLAKE2B 839b519a564f1842802658abdd20ff4eb0d414112ffb843cbf09420f426ae13ea2de6aed993a7806c83e45bbd540f3ca14b40343a02b65e8d106def386cd40c8 SHA512 afb5c402fe3071fd020be4811599d87b9c380987f6752f42527ca365bdf103c8b4e71b60c566817f421ed49b9b76421531210935666e39965f047e13e18a9163
+EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.2.4.ebuild b/dev-util/clion/clion-2022.2.4.ebuild
new file mode 100644
index 000000000000..c924960bdb42
--- /dev/null
+++ b/dev-util/clion/clion-2022.2.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-util/cmake
+	dev-util/ninja
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-devel/gdb
+	x11-libs/cairo
+	x11-libs/pango
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/cmake
+		bin/lldb/linux
+		bin/gdb/linux
+		bin/ninja
+		license/CMake*
+		lib/pty4j-native/linux/aarch64
+		lib/pty4j-native/linux/arm
+		lib/pty4j-native/linux/mips64el
+		lib/pty4j-native/linux/ppc64le
+		plugins/remote-dev-server/selfcontained
+		plugins/cwm-plugin/quiche-native/linux-aarch64
+	)
+
+	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64 )
+	use x86 || remove_me+=( lib/pty4j-native/linux/x86 )
+
+	rm -rv "${remove_me[@]}" || die
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
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}]