6 files changed, 69 insertions, 123 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 185f65044ec0..b7e60ef0f4ce 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 833a829cc080..8d11de059076 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,8 +2,10 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
 DIST aruba-1.1.2.tar.gz 132680 BLAKE2B 328c012eccfb988eec280a102da94150d1811fc67816c09aa2b94f1b6a06ca68e21cd4612e87fba089f4eb9f3b90716cfe121bda306936eeb53019cec539e651 SHA512 58f658c118fe83ddfbb6c361ab3ce6ae5e6084e4233dba62350eba1c911d8ad0558d1ca604206691d097a48453d608042bd992730b92971cdd3d2475d8f6ca4e
 DIST aruba-2.0.0.tar.gz 132762 BLAKE2B b06190d3a1698c5a2d295df16096b2bd587c60a9c428d35e8ad24204b71b7a3d86f5b52a5f601f57204903412508faad3d4032f1499d78a309a99df63e8a68e5 SHA512 214de8dd3dd29b46ddac2605bab5008ac9d9755eef53c140aea5f160aba60ed9ac71ac5e1410f59700ddd8a506faedf6b54d99682c875faeaecbb47ad8660435
+DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa
 EBUILD aruba-0.6.2-r2.ebuild 967 BLAKE2B 6a11fa4ca7af64f825b1251d470190a64608279aa1f2735e1ffd458479e22e9ffa6739bef16d3e714cab5ec53a16fd31401d1a47c675538a5fe8b2480d48204b SHA512 c922d4e5a19162aefb55b4415547222d1b799bcb7f239e6e9167a96349c76804b569829b60f91289e781c1dd4211361ac7b3ef547be92a8b35712dd5075b6916
 EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.1.2-r1.ebuild 1948 BLAKE2B 3350e24d20c4de6d9738efb11424e6963df85112e66286166285f81d7e100fea21e6d2e779ea3ba454b6345e51ba4ebb31374f14450de5d7f2af792c09f3f324 SHA512 a48b19aa3574fe8263224fd7b927ceb0201ac0baf57e9871c5ac1e886664f34f17e8fe7c1068f8fe57a8c08287af14ccb82f5880900a059761d15cf33237f2da
 EBUILD aruba-2.0.0.ebuild 2018 BLAKE2B a8cd9a16001d387a95bbcd76dc1d82aee2e36f907c8ed344d3bdef8055ef6987b0f01149c23100bb14bd4102e6ef7ad44d6c9003aacc1961f44f1e1e35cfd946 SHA512 a464afc8ce044abc9905999bd32187b7ec253a396cc0c6f34bf14c674870dde9386e39a05146ef58e2c00db60e5f12116564f180c2bc7e7fff41c9063a7035a3
+EBUILD aruba-2.1.0.ebuild 2108 BLAKE2B 0c66771968dd4cbbf2117bf342a418421d990e75dc781bb3400ae25d51c3f8ee5884da166331d24adeb10d9930faa920940dc3572ccc04a40dc586fc58bb7ba0 SHA512 3dcbd4b1e4673c2d74626080dd96866d41941e5014abd23b52fcc13518bff1f9c71becbdb35833be131da0bf942885158afb12cf6598599619bda27809a5f9d9
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-2.1.0.ebuild b/dev-util/aruba/aruba-2.1.0.ebuild
new file mode 100644
index 000000000000..08d6587bf10d
--- /dev/null
+++ b/dev-util/aruba/aruba-2.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	=dev-ruby/bundler-2*
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0 <dev-ruby/contracts-0.18
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-9
+	!<dev-util/aruba-1.1.2-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	#rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/\(pry-doc\|rake-manifest\|rubocop\|yard-junk\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i\  @wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Create files for Minitest/i\  @wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+	# Avoid feature that requires aruba to be installed already
+	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber --tags "not @wip"
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 9a564cfa53e1..ae668400ba43 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,22 +1,18 @@
-DIST llvm-gentoo-patchset-15.0.4-r1.tar.xz 17504 BLAKE2B 12b9c414ce9439ae76b8465376131edcbd41ad17576bda831f1ccfb56948b70926411f4f919b62151bdd526f75d0547964af8cfdfeb05dc376e483859d1530b4 SHA512 a85a299e9f8f7bc715df0a4b28b7f1f9cdb5c34c9c5daeb4fcc778832d55e48f2a3b9c4188713bbc8f0246da95fc8af5f4a0832c1aa426350dfd7bad9ccff226
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
-DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
-DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
-DIST llvm-project-f6f1fd443f48f417de9dfe23353055f1b20d87ef.tar.gz 170625743 BLAKE2B 3add45d7e2f26659f9602b5ccc034033610921ebeb2d6d69d6f5a3d1e3af224d3f5fd42e411d1fe0d5f8249c2ad995d41a236a87eba5a72ea9b20c112faa4c2f SHA512 2b57132d156f3d6d96802f617fff3eec0df6a3b5077ddcc4f31c87829e617f3065074d80e9d26c8c1c64322e76a09321fdfc8ae1d7a84f5da9f8606125e3b635
+DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b34249e8a601842412216665cf00df1b93bf590815d1dd1a709ce5006671bddb92cda7d42a5d099f3cfc3968368 SHA512 91a303661ae706bde45a7d12da928735690fdbb48901a31d6477c2d8595a42a59d4e07dc0ffe4eeb64e0775c61c329b05c0f12ccdece7bed1d5a9093db690f34
 EBUILD lldb-15.0.3.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
-EBUILD lldb-15.0.4.ebuild 2743 BLAKE2B c95d3acc30db1537fec7bd23a297db41f1e190862d93b12a1d4e107e372a22e721939726fb9596e34040a4c228d86ebec6805d09111f6e4c6793865826526439 SHA512 9794c7774b79227349e49eb1d311832f02f870c9c4bfb02f78941fb5497d37a865ae38d9a050e920a354a3dff756559e8e91cf67265dd58c451a21db82a0aee9
 EBUILD lldb-15.0.5.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.5.ebuild 2718 BLAKE2B 99e4f1154fd04f50199aa6510be2ce8b42c855a5fa37acbaf746e0689324fa0c0eadae85ff9ca6c00b31979665cbb31327a7372d61d3e0e3b006fcd24ca01356 SHA512 9c8a1ddbe6f22fab2f0f0f23b04475a73d3c88c21704de55997612b7b7455e47be5f5b16cb380e99e9313b92d90de464569fba9a5493452331b85fb4d2a98357
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
-EBUILD lldb-16.0.0_pre20221113.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221120.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
+EBUILD lldb-16.0.0_pre20221126.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-15.0.4.ebuild b/dev-util/lldb/lldb-15.0.4.ebuild
deleted file mode 100644
index c355192bc737..000000000000
--- a/dev-util/lldb/lldb-15.0.4.ebuild
+++ /dev/null
@@ -1,117 +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="~amd64 ~arm ~arm64 ~x86"
-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_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=${PV}-r1
-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_VERSION}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-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_pre20221113.ebuild b/dev-util/lldb/lldb-16.0.0_pre20221126.ebuild
index ee34e2696fe0..ee34e2696fe0 100644
--- a/dev-util/lldb/lldb-16.0.0_pre20221113.ebuild
+++ b/dev-util/lldb/lldb-16.0.0_pre20221126.ebuild