10 files changed, 362 insertions, 6 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5074f638e236..2d0bb2c8e3e0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c609f569e11e..d66f68bdce0d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,6 +4,6 @@ AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df252
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
-EBUILD buildbot-3.6.1.ebuild 6530 BLAKE2B 68f3c78e8dccb93a8ac7ee414216248c9c6cc5d71379862575cfbd9f3ab59f0c76eca4028959d280af2ebf6cb74420791e81b47e22d19acfa5e379abd080e9b3 SHA512 120276cdd94a4dc522d4ca179877e8f844858ad8a8cfab18117479601aaa6bf24a184a78114756788e9ca0fa5ea1144b6cfde1913d76b3fcad416d0d6bc44ebc
-EBUILD buildbot-9999.ebuild 6526 BLAKE2B fef75f98498b8388c9a5a30bc826880a734c61c9de2d5d2380abcbca8db3d2d0fb5195608563dd759e5d829123929f432bc694c021645981e24d81d78cb4701e SHA512 b302d9a2b6a4b6f87a4131d579b257dc514d997dcf2d0891294b33c8dc806af3485b2bf3615ddc963d3ed4027ec0f97bfaa2e29a81b36f08fbd1a63b443041fd
+EBUILD buildbot-3.6.1.ebuild 6527 BLAKE2B 0ca0e8aef7f7e49827b867d8412f33f91127dc5632263d3ddaa482cf5add9de1bbfe81604419e1d07ab4d43b13eb89a1cda405505ca66770a8ae7e6e271f6417 SHA512 2fb4f2eb56d56e4160abac7b08bc91b2e67d2716f1bbe25150e4c31114db35959e558223bc808d8ee046d510bdf0dc5364c773c957f29a9198c1a716b6201a51
+EBUILD buildbot-9999.ebuild 6523 BLAKE2B 714b1537bfd07f5a2c6bcc8e08d66f43795f6efc4568364f6791c4af3a25996bb5aa01b68a9336b56c1d3e3702f98f9ae542e14f758d49a31177b6927379ce67 SHA512 8c87c5eda03869f85803d1f30ef574e1950230b15a60f0df69e2cff2a7bbb41a8816d67162dcc88c8941cac3fe5b33eda0826f3e8d61076237b3907b37855cc1
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
index 783139307996..866193742b47 100644
--- a/dev-util/buildbot/buildbot-3.6.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-python/txrequests[${PYTHON_USEDEP}]
 	)
 	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-2.2.0[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 1a42f1fca759..05958fa7d93f 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-python/txrequests[${PYTHON_USEDEP}]
 	)
 	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-2.2.0[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index c6e8430ec348..2ed04745f6ac 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -100,6 +100,7 @@ DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST git-delta-0.15.1.tar.gz 499576 BLAKE2B b29972e8fb1e640ced5f8148610a17177e08cda2988189bd3cad585937c85b8b749cf3e3fd4648599462b4272d4f3b99448cead13a688289732106e744a294d5 SHA512 646244299ec79d59ff91fd0b2d9600795a6c0e4f3f6efa6629217a6847d6b736ceed45bd52435aeb25cd80ffa9630bf9cebce35312fead3de2bb5b0d04e790c4
 DIST git-delta-0.16.4.tar.gz 506782 BLAKE2B 6926544e973c00853359f1870ae1e38e8fb4cc7bc217f15fb68dc96ee6de2d70b45aa8fd054c07aa126db427d1a8e4af4bfef10dda05fb5ccf56a623af4e1ed9 SHA512 9052d5db95e2977844581d8d7027c0e9c16c407120d74fc0e72b47db003424add49620dcaaf7ccd686a788187ce277568491bd6e9300c867da208d50387dbad8
+DIST git-delta-0.16.5.tar.gz 506739 BLAKE2B 28e88c84fc299c3b148eb71bcc3de26dfc5d52140e79d188d71d2a8c902485e06ed62c09826cdf22c7d97f6aeab42e5c39d09b26aac49afcacf4cecd0c690ff3 SHA512 76475159ad659261dea3f60e5ee340d64f16031b59387602a6b962f854e5c88e5ad1613715ea0581197d8b829c75326d25c9550d0899957a0ce7e4dd5d3046a9
 DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
 DIST git2-0.16.1.crate 199956 BLAKE2B bf187855d683b13ec8ec0e103f6536fc2d8321d2a023eebca907a15f0bba760f833cce4a4b0958804675aeae1ee9d2dc0270edf02c66cc2d7231980ba7ab15d1 SHA512 4963798b6d9fc087a4394515b0f6da0a9e01fcbc220dc3d1880a277ea0487083ac05c0bc3a52a537885eb065a9b2209658a199835457b38c94e45395ad8d6252
 DIST globset-0.4.10.crate 22923 BLAKE2B 10bb8db9ceae039143e36c2f1c3cef92848277ae7b4bff6669f1c25aeb3ae1d322da7d88ec13cf9b0ba5edc0e27a52843a5672a8dac225d3c37bc1785c04e6fe SHA512 85a1213fd3ec55ffd87fde25f4cdbd2e8ed4056132d3c516eb117f107a744d733e1ad8fa06f296a60084a23ee968c3c0899399fd3ab9bbf72e217638a5cf165e
@@ -315,4 +316,5 @@ DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d759355
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD git-delta-0.15.1.ebuild 4412 BLAKE2B 88a1da51a943d9c9f8917df9f4e1cd089230f31d3c71852a49f1b5fe18ab6cca757b2fb7e0b5aaebab8876238d9e72692786f7965cc5b61c0a117458729966a3 SHA512 ef2123dc35684c6571fb4441e8d0c5cc0687715d8f12f2c42f28cc9ab489698b1e9454e107952560f153ed1ab123b9fffdc4a49664ed7e8ffafd5471116ca6c6
 EBUILD git-delta-0.16.4.ebuild 4784 BLAKE2B 3a0c45c2a815ca4b0234ecb9706a7656716c4aaa2b97fee1ed0a93ddbaeeb7165a4caa8266452ab6ab58407a4b9a4752c42c3519cbe8a190f20807b24b44e9b5 SHA512 02924b2283072de938a26ea973fb5e80800913a2668a6aa545560e3b13664e19d04e88e4fb3f207438bd1e5c85ad2af600a7ef7c94cb173d953478b734f92d24
+EBUILD git-delta-0.16.5.ebuild 4784 BLAKE2B 3a0c45c2a815ca4b0234ecb9706a7656716c4aaa2b97fee1ed0a93ddbaeeb7165a4caa8266452ab6ab58407a4b9a4752c42c3519cbe8a190f20807b24b44e9b5 SHA512 02924b2283072de938a26ea973fb5e80800913a2668a6aa545560e3b13664e19d04e88e4fb3f207438bd1e5c85ad2af600a7ef7c94cb173d953478b734f92d24
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
diff --git a/dev-util/git-delta/git-delta-0.16.5.ebuild b/dev-util/git-delta/git-delta-0.16.5.ebuild
new file mode 100644
index 000000000000..d1eb8ae038ca
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.16.5.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	aho-corasick-0.7.20
+	android_system_properties-0.1.5
+	ansi_colours-1.2.1
+	ansi_term-0.12.1
+	anyhow-1.0.70
+	approx-0.5.1
+	arrayvec-0.7.2
+	atty-0.2.14
+	autocfg-1.1.0
+	base64-0.21.0
+	bat-0.22.1
+	bincode-1.3.3
+	bitflags-1.3.2
+	bitflags-2.2.1
+	box_drawing-0.1.2
+	bstr-1.3.0
+	bumpalo-3.12.0
+	bytelines-2.2.2
+	bytemuck-1.13.1
+	bytesize-1.2.0
+	cc-1.0.79
+	cfg-if-1.0.0
+	chrono-0.4.23
+	chrono-humanize-0.2.2
+	clap-4.1.8
+	clap_derive-4.1.8
+	clap_lex-0.3.2
+	clircle-0.3.0
+	codespan-reporting-0.11.1
+	console-0.15.5
+	content_inspector-0.2.4
+	core-foundation-sys-0.8.3
+	crc32fast-1.3.2
+	ctrlc-3.2.5
+	cxx-1.0.91
+	cxx-build-1.0.91
+	cxxbridge-flags-1.0.91
+	cxxbridge-macro-1.0.91
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	either-1.8.1
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	find-crate-0.6.3
+	flate2-1.0.25
+	fnv-1.0.7
+	form_urlencoded-1.1.0
+	getrandom-0.2.8
+	git2-0.16.1
+	globset-0.4.10
+	grep-cli-0.1.7
+	hashbrown-0.12.3
+	heck-0.4.1
+	hermit-abi-0.1.19
+	hermit-abi-0.3.1
+	iana-time-zone-0.1.53
+	iana-time-zone-haiku-0.1.1
+	idna-0.3.0
+	indexmap-1.9.2
+	io-lifetimes-1.0.5
+	is-terminal-0.4.4
+	itertools-0.10.5
+	itoa-1.0.6
+	jobserver-0.1.26
+	js-sys-0.3.61
+	lazy_static-1.4.0
+	libc-0.2.139
+	libgit2-sys-0.14.2+1.5.1
+	libz-sys-1.1.8
+	line-wrap-0.1.1
+	link-cplusplus-1.0.8
+	linked-hash-map-0.5.6
+	linux-raw-sys-0.1.4
+	log-0.4.17
+	memchr-2.5.0
+	miniz_oxide-0.6.2
+	nix-0.26.2
+	ntapi-0.4.0
+	num-integer-0.1.45
+	num-traits-0.2.15
+	once_cell-1.17.1
+	onig-6.4.0
+	onig_sys-69.8.1
+	os_str_bytes-6.4.1
+	palette-0.6.1
+	palette_derive-0.6.1
+	path_abs-0.5.1
+	pathdiff-0.2.1
+	percent-encoding-2.2.0
+	phf-0.11.1
+	phf_generator-0.11.1
+	phf_macros-0.11.1
+	phf_shared-0.11.1
+	pkg-config-0.3.26
+	plist-1.4.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.51
+	quick-xml-0.26.0
+	quote-1.0.23
+	rand-0.8.5
+	rand_core-0.6.4
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	rgb-0.8.36
+	rustix-0.36.9
+	ryu-1.0.13
+	safemem-0.3.3
+	same-file-1.0.6
+	scratch-1.0.4
+	semver-1.0.16
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	serde_yaml-0.8.26
+	shell-words-1.1.0
+	siphasher-0.3.10
+	smol_str-0.1.24
+	static_assertions-1.1.0
+	std_prelude-0.2.12
+	strsim-0.10.0
+	syn-1.0.109
+	syntect-5.0.0
+	sysinfo-0.28.2
+	termcolor-1.2.0
+	terminal_size-0.2.5
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	time-0.1.45
+	time-0.3.20
+	time-core-0.1.0
+	time-macros-0.2.8
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.1
+	toml-0.5.11
+	unicode-bidi-0.3.10
+	unicode-ident-1.0.7
+	unicode-normalization-0.1.22
+	unicode-segmentation-1.10.1
+	unicode-width-0.1.10
+	url-2.3.1
+	utf8parse-0.2.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	vte-0.11.0
+	vte_generate_state_changes-0.1.1
+	walkdir-2.3.2
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.84
+	wasm-bindgen-backend-0.2.84
+	wasm-bindgen-macro-0.2.84
+	wasm-bindgen-macro-support-0.2.84
+	wasm-bindgen-shared-0.2.84
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.42.0
+	windows-sys-0.45.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	xdg-2.4.1
+	yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 CC0-1.0 LGPL-3+ MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}"/etc/completion/completion.bash delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}"/etc/completion/completion.zsh _delta
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${S}"/etc/completion/completion.fish
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index d2063776a766..f8e852c5f8a8 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -9,6 +9,7 @@ DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8ef
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
 DIST llvm-project-a2684acfb61d40f441e240035d7f1ba50da637c8.tar.gz 184900914 BLAKE2B fb1f836738415a640bc84283722f6a7355a06bc8ac05b544dd4ad4ac9552dcf70040b82b0493c5b4485b28610412279ec0adcf467e71915167aa7d010c08216e SHA512 c08ff8abc166399e692d3166ccf65eb4b647893cba8ffc10bcda815bc914a944855bac036d6349f6d820a6ff43d5417170e6ff8620d97a2a144a0898e95d09e3
+DIST llvm-project-f9753ef1893c3d953a0244e7935d3997499b079a.tar.gz 185505236 BLAKE2B 570a8937788027ee2cef0dad6be693c57b4a5634c0c1fc2bc1c2f534fb4ae00203f14b1bcf0a0f241e7e1e8c25120dc6ea7ede2a10bed397e1cc377318ebe7a0 SHA512 c12eade7c9790ec2a790017b1451a15f0ff7d1b60879f08a448edcb4f162703650b244fdc2fc284335dff4b2a37ef5d488e0d771abee79b49cac94b9e478f010
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.3.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
@@ -17,4 +18,5 @@ EBUILD lldb-16.0.5.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2
 EBUILD lldb-16.0.5.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
 EBUILD lldb-17.0.0.9999.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 EBUILD lldb-17.0.0_pre20230526.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
+EBUILD lldb-17.0.0_pre20230602.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230602.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230602.ebuild
new file mode 100644
index 000000000000..bc7ef862dfa0
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230602.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="+debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index c5b2305c0d34..ecc10a26a947 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2023.1.1.tar.gz 577304778 BLAKE2B c630c4a21edc2c36e972965e35df63500dafe8ecbd5eee9c6246785bf9e6962e048759a8674160fd47de810a75ffcefe0df14149746ca789b8064623551bed19 SHA512 d0c2419b77ca34c04579f8d52a20427a927fc4d7b3edb1e7787ed515cdc3777b19d963c22975c932c3e568c1861ec7806955514921a1156e497b584f816cd6a2
 DIST pycharm-community-2023.1.2.tar.gz 577374290 BLAKE2B ed21b0874f4d0fc575f5b8e9e4e1ec23706de7216009ffd27440dac245f0513566b9df6e3a962ee5df9783aa9f6c9ce2c626883d173723222d08b5288d71f153 SHA512 1d251cfeef0b7c6a5d7fa563ddef99df2c143116e893878346c04788776052aba2cbb0c790e6fe72ad44e86f785bcb76e2cefae15bda387c0a48a6d01b429813
 EBUILD pycharm-community-2023.1.1.ebuild 3144 BLAKE2B 7db808cf672035782d54e62394a4d0ea1248f7d6ca4d290aa2daab6df7c6e3c47c397a97e2ea807a5d18b40f5004c44eb1664f3ab859087c1d37cdfde979e15b SHA512 df4fcc71337554902d697db64c8dd382d6edd1c5e8ee61670fe364c6a9e1d566c14d59fd5ca34f6826f3e0c54b7ffed336856e42ff0afbc2b389df018ccd02cd
-EBUILD pycharm-community-2023.1.2-r1.ebuild 3164 BLAKE2B 99e64dbc57ec7b8f4b5f10ff2083412cc05b2bcaf9357fc8391c898322b9d4e542bd4ec0accf19a89b3ba58c5e68db8a5a11edcbb86d49ea390cf9848d9e1520 SHA512 19c12c7bfc5fb72f13e09e1105f2694bd8377e0779457e0f96754b7b2fd0a24ba397e94ee86ee00d1d045eebbc2ae4a70cd08fbced1601f88618afbc92f9a206
+EBUILD pycharm-community-2023.1.2-r1.ebuild 3171 BLAKE2B 97a5588a8c858cf9ee8c77cda10a7c33797d60cb624641127d0ba0370d5109eca33be00d71a08bc89023314ac9b7be7b62283c69e6b83057eeb1bd18dce006a3 SHA512 fba716103e16415082db6dd03234d6f5b4cae781e23722f35c1f6237d78b69f18af328b957719295c96b4a846cbb4220dca3022eb9eabcb395294cced16aa723
 MISC metadata.xml 305 BLAKE2B a5ee9ceb727e22160e23fc785ddcf2b7b22afd9599e956de38bf4318c4cab2acf5cffa6d1f075ac24d866d407e9412ba02362c9942b3aa34a7276e55cc44f161 SHA512 e67f65a2f5fcb0c7a7bfecdbba77c91844e89f4110ec66bb5838fdf7fb5abb57d141c2a816b7867001fc919c8721fd7837705b9a4f8853ce0728e33096fee19f
diff --git a/dev-util/pycharm-community/pycharm-community-2023.1.2-r1.ebuild b/dev-util/pycharm-community/pycharm-community-2023.1.2-r1.ebuild
index 780eee644fda..2633a29ce241 100644
--- a/dev-util/pycharm-community/pycharm-community-2023.1.2-r1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2023.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+bundled-jdk"
 
 BDEPEND="dev-util/patchelf"