9 files changed, 69 insertions, 300 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 89d301b28118..826c5e08ab3e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index e06bec994c97..277d5e6afd11 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -3,10 +3,13 @@ DIST crash-8.0.0-patches-1.tar.xz 38880 BLAKE2B b1b22a55f07e7c23c90d13769cdf0db9
 DIST crash-8.0.0.tar.gz 1281026 BLAKE2B bb86bc64d04ce136295bf57097674e96d29e5c934b2fc55f2bd5fa331f2d0086929e1fc7ce60b75b4df1ded128e71048e555bffc3321f6f860d00a8fae8bc09e SHA512 c52afab6c8187dc0c44a13b2a5b33bd7df33d9ee12bcecc6b7e94e8bc98d9470c134cb0fbe941b750f36a66028aad718bfd6f1a00524ad38ce43d1f278048a3b
 DIST crash-8.0.1-extra-0.tar.xz 19152 BLAKE2B 60e40fa646f19fe1c5c120812f25c9b1ca3ace975decdeda3c4914ee730a15faf374c6400419ec5d2923c6c79a13d4c63b03fbc4410b2bef5b166015560e63e6 SHA512 1797f6200b7ef9c9bd1e3c1efe499f5d9c5fe70213f0adac55a763f3b8675e4eccf04a62223e321c5d23a426e214860205222e78ce6f36c0dab2f7bafc141824
 DIST crash-8.0.1.tar.gz 1293336 BLAKE2B 97c2e6e9f8407d6f310afb120c9609f845fb4395543634dfca5bf1278aecacb2fb30ead890f72ac476674ffd9df189e26e4261f09c577e0fcaaaacfe120fe6f1 SHA512 ef9fe84dd5efa1b0570f71a8dd7af398a2ff35e9dc9fbcbeafd0f5ff503c7c4da93a33ffddfbac672fe12788dd3712808d6726ba9161ce282a7c76c3e2dc0793
+DIST crash-8.0.2-extra-0.tar.xz 19716 BLAKE2B a87e499314f80babb249c45e613f890b7d157e40ffb42a728cc96913b46c81deee91b79b296b1153ce6c69bb96d22123ad5c54481153ed5bc6be74965a76b298 SHA512 00eeab3fa73e2cc4283d6263fd3d743832dc66a705207a3cb347d1c4735d9f2ba8bcbd3e9739a20878d3b8438cec9d12742049186a9f1d4ac0bfb7a27b4c31bd
+DIST crash-8.0.2.tar.gz 1298881 BLAKE2B 120b68cfd0ae07b9f1e302a549f2095c2d9cd83cd5281b55b7d3e96242c6ce85db94afb6980f89ee14dc395d5d48dec0514349142e7dd33665ef331ed2bd987b SHA512 9ff24d1206e9376e83690f76c817a48a68ff6adce677fad70335a73550a59c9af6e4753c1199f22eafa60c137156313244bbf98ed01bc2b066f41d324738ef6b
 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
 EBUILD crash-7.3.1.ebuild 1049 BLAKE2B 87fac2ac007629723f10c252808eb104bb3b90695cb9c847c35b169103fcc8b652619eb789a58c5232142fb56350404c0b3d2f3ff9f893ef148cdd4ba6c745f7 SHA512 6d705509862b013b9882194520691958abf108a45ff4828f98c1392b54ff1a33f51e45dd69e3aa2fb71a156d1ec9fa371186a760c1773df5e4521f403b3161da
 EBUILD crash-8.0.0-r1.ebuild 1179 BLAKE2B 50d3e7be37ea782f0c02e64d6ab2274f3b1348eeeb93d72e9e8c8c2e44383038fd5b196a3478cbc5400cdea72a05b35f5da1596492949ec7e5b7ec0a03173cda SHA512 689bda50c66921eb02b0abf0788e4befe92e3b98fe527d5881ee4f8a479df9d4c67055be714d8df7b12fcb2e842f1376b33aacaf6574efc6da0c96a665c5a10b
 EBUILD crash-8.0.1.ebuild 1675 BLAKE2B cafb83bb7a1fffa4bcac72bac03f6f521bc87c4753ee1b1a971d95b0cc1b8c119337968ce766afed42fccc2ffcf87df8802b72f6584890ced95488c524befc08 SHA512 805a982d7872efe4343f1571170712a69a9f5e409fbc15ca398d5eec862fdf809141276795442a3d655eee77012190c842dcb21faa864f503c8138f7bd820388
+EBUILD crash-8.0.2.ebuild 1675 BLAKE2B cafb83bb7a1fffa4bcac72bac03f6f521bc87c4753ee1b1a971d95b0cc1b8c119337968ce766afed42fccc2ffcf87df8802b72f6584890ced95488c524befc08 SHA512 805a982d7872efe4343f1571170712a69a9f5e409fbc15ca398d5eec862fdf809141276795442a3d655eee77012190c842dcb21faa864f503c8138f7bd820388
 EBUILD crash-9999.ebuild 1051 BLAKE2B dc00010d83da71a08cc149a223e512689db4904a68e7dcfe0316becbb1ba4cee349f013805559a1d2326d7be77005f0dc8b953d497e5f0b8f90669992cedf07b SHA512 865d0b6d2ce1ccb6924326772607ca5f60635a31e53730a69a8f5394902a1738b29bda934e22dbdf0ab02dc17c64e91d9f24ab780e73f3fd24dff98673c1ac0f
-MISC metadata.xml 641 BLAKE2B 48301b1c1db0805eb7514f7c41f40f31535652ef57e09c227b939470259c891333bb96a288b1eee725f9b93c3640efd28df94eccf2f8996e3e85412c7b015181 SHA512 2aefb1422f38b6532a11bfb508c1c13c1ca85931ebbe47d93f2f193df5f7a4e622283425b68d898ce7921c301d8d5937c2c5c848917e5a0e3f2f13de03ab310d
+MISC metadata.xml 725 BLAKE2B aa1069adb8920a1a083071898391a4544489b3ba5d177160e2e0bf53c1bf88da930fe6da700dfca263f4bb381d01194da156b28b6e05d251bd3e9d3b45f6aa21 SHA512 6d5757aae00249a9f62c67c15ac032c9b3275068b14c02f4edeb425910ce1cfaf8a135ef49356e78ba2c836c627b576f4b45bdc8b8f8131d38175d9e22660912
diff --git a/dev-util/crash/crash-8.0.2.ebuild b/dev-util/crash/crash-8.0.2.ebuild
new file mode 100644
index 000000000000..eea9dfb346d1
--- /dev/null
+++ b/dev-util/crash/crash-8.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+GDB_VERSION=10.2
+UPSTREAM_VER=
+EXTRA_VER=0
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
+	SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz"
+
+	[[ -n ${EXTRA_VER} ]] && \
+		EXTRA_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-extra-${EXTRA_VER}.tar.xz"
+
+	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		${UPSTREAM_PATCHSET_URI} ${EXTRA_PATCHSET_URI}
+		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
+	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+fi
+
+DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
+HOMEPAGE="https://crash-utility.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# there is no "make test" target, but there is a test.c so the automatic
+# make rules catch it and tests fail
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Crash's Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${EXTRA_VER} ]]; then
+		einfo "Try to apply Crash's Extra patch set"
+		eapply "${WORKDIR}"/patches-extra
+	fi
+
+	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+	ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
index 31bbffaa9268..733de0aacc7f 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/metadata.xml
@@ -12,4 +12,7 @@
 		combines the kernel-specific nature of the traditional UNIX crash
 		utility with the source code level debugging capabilities of gdb. 
 	</longdescription>
+	<upstream>
+		<remote-id type="github">crash-utility/crash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index a4fb770e132f..8c3ad1c2478a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,7 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
-DIST llvm-project-e99edb92356b5ba078b5bc4d5846770414586a1d.tar.gz 171822327 BLAKE2B cdaa704c9f238f34751b92df92f8a767b1204f868dfd8a6f1eb3eeacaaf9c4b63c55a7c0534af124fddb65cf80263f72b79190696c8077e2990984a84a040f2a SHA512 37f45a56d6086df60c9832b75da3b2d78b8ec0fe094f07d41695f0565e4de0c13e460b1fef495864f07300d41f5b32769f0862b0fa5d53c0db9a0ccec1a09072
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
@@ -15,8 +13,6 @@ EBUILD lldb-15.0.5.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0
 EBUILD lldb-15.0.6.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.6.ebuild 2718 BLAKE2B 00164a23d8cec820742a5d757711fe836f3eaf00c94bfb39028d832bf7c5695895c0162fb2408fc3c6b51e0d4f1405a280b1fe5fc87254c168c9b2a624ff9efa SHA512 2c0888251ff9d453f5bf24ac68c3164459da0327b99ef78ba85200020de638d3583efcd22febd429e1f3ff1f63863cd42cec146238ca6ba55dda8b300b50625b
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
-EBUILD lldb-16.0.0_pre20221126.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
-EBUILD lldb-16.0.0_pre20221205.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221210.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221217.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0_pre20221126.ebuild b/dev-util/lldb/lldb-16.0.0_pre20221126.ebuild
deleted file mode 100644
index ee34e2696fe0..000000000000
--- a/dev-util/lldb/lldb-16.0.0_pre20221126.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-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/lldb/lldb-16.0.0_pre20221205.ebuild b/dev-util/lldb/lldb-16.0.0_pre20221205.ebuild
deleted file mode 100644
index ee34e2696fe0..000000000000
--- a/dev-util/lldb/lldb-16.0.0_pre20221205.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-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/rbtools/Manifest b/dev-util/rbtools/Manifest
index 21454be13587..9f738c9b5560 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -4,5 +4,4 @@ DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f
 EBUILD rbtools-3.1.1.ebuild 1346 BLAKE2B 4d5aee256901d80aa1511e9e66def578ebd1c5b76bf82bd302b3739f0e38fe3de1e550f7e0bb3ec52e8a6db8a5facd945f0ff634cac08c69ba9e6e6b5cf8040c SHA512 3056584ca24081f687eb4e75782d7981ed9f14de3cd5829dd6f14a5d6ed7c6cddeb14661a4cbcfa865f15c0ee2fd95531ab83862469330eec2ded2d80f3086d3
 EBUILD rbtools-3.1.2.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
 EBUILD rbtools-4.0-r1.ebuild 1719 BLAKE2B 81851ded38b2e597218ad335a1cbe86d2cb22833820c1930b3ba84853087409782c9514f2668d9a22015f8a9e31f042ad1a85da020fd37936332b382c08db89d SHA512 3d58f96d8a0e0c14917f0fe119af18c0431e873a45743edcdb8de9c72ceeb1b96d52566daa443971965d9d45709413da6ae71ed7490bca2ad590dadac495ae8f
-EBUILD rbtools-4.0.ebuild 1642 BLAKE2B aeb5b00b5bde0f18181867b1639ef965682fda85117dea87c7d73c7fbc8ece1350bb06ce77b79afb46b6c9844dd626563fdb8ebc144ed771307178bd9ac2a55f SHA512 c04424d1b77cd0aa63604b12d3b5383b899c2fe902a7926c395c717ef94b48299371bddb4da0297336fa9f883e2d2464e8d0996fbd7d0491871bd28bacf45a84
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-4.0.ebuild b/dev-util/rbtools/rbtools-4.0.ebuild
deleted file mode 100644
index 174e2f932e6a..000000000000
--- a/dev-util/rbtools/rbtools-4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit distutils-r1
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/importlib_metadata-4.12[${PYTHON_USEDEP}]
-	=dev-python/importlib_metadata-4*[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/pydiffx-1.1[${PYTHON_USEDEP}]
-	=dev-python/pydiffx-1.1*[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/kgb-6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-env[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Avoid tests requiring unpackaged test data
-	rm -f rbtools/clients/tests/test_scanning.py || die
-
-	# Avoid repository specific tests to avoid dependencies on them
-	rm -f rbtools/clients/tests/test_{cvs,git,mercurial,svn}.py || die
-
-	# Fix test that appears to expect case-insentive comparison
-	sed -i -e 's/TEST CONTENT/Test content/' rbtools/utils/tests/test_console.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	distutils-r1_python_test
-}