12 files changed, 137 insertions, 92 deletions
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
index 2ba661e0f8ea..59e34d7bb3be 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
@@ -53,6 +53,7 @@ src_configure() {
 
 src_compile() {
 	python_foreach_impl meson_src_compile
+	use doc && build_sphinx docs
 }
 
 src_test() {
@@ -83,6 +84,4 @@ src_install() {
 	}
 
 	python_foreach_impl my_src_install
-	use doc && build_sphinx docs
-	einstalldocs
 }
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
index 2ba661e0f8ea..59e34d7bb3be 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
@@ -53,6 +53,7 @@ src_configure() {
 
 src_compile() {
 	python_foreach_impl meson_src_compile
+	use doc && build_sphinx docs
 }
 
 src_test() {
@@ -83,6 +84,4 @@ src_install() {
 	}
 
 	python_foreach_impl my_src_install
-	use doc && build_sphinx docs
-	einstalldocs
 }
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 75192372b790..37c1ced94057 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,4 +5,5 @@ DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349
 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-e99edb92356b5ba078b5bc4d5846770414586a1d.tar.gz 171822327 BLAKE2B cdaa704c9f238f34751b92df92f8a767b1204f868dfd8a6f1eb3eeacaaf9c4b63c55a7c0534af124fddb65cf80263f72b79190696c8077e2990984a84a040f2a SHA512 37f45a56d6086df60c9832b75da3b2d78b8ec0fe094f07d41695f0565e4de0c13e460b1fef495864f07300d41f5b32769f0862b0fa5d53c0db9a0ccec1a09072
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-util/lldb/lldb-16.0.0_pre20221205.ebuild b/dev-util/lldb/lldb-16.0.0_pre20221205.ebuild
new file mode 100644
index 000000000000..72546bf6ab3f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.0_pre20221205.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,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/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
index c903cab9b818..4f71cf92ec9f 100644
--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]]; then
 	"
 else
 	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	REGEN_BDEPEND=""
 fi
 
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 1080c19ee545..ab5b7da23c11 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,3 @@
-DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86945b7b08bab1b172e557b80c0183352068722e6d530a7b0c2fae85f24ae1bbef9116538c5c31735ae5c47f313 SHA512 41ef3f6ad030e3551b76cce5358806442ddc78ad14cb3f2f5978d25858b44647fc80a8a98c84edc112d3e121748fa49aeca0ae24287c392d2f8d1d3b72df12ff
 DIST RBTools-3.1.1.tar.gz 317592 BLAKE2B c50e27cf67e2015904e2330208f0d13ec5a799d0820f6477a6701553140851a5d82de65fbf41d8b64bfcf0028a9baf27b710909d230e1798032a4e28f2b43935 SHA512 1a1aa51f8924b1fcdc100c0337c66870284b8c3c91cb756d231509111e4b9ae233ccae1245251e826dc23c699553f5d3441e4b9ef2b80f32d4ce8876dfa43819
 DIST RBTools-3.1.2.tar.gz 322538 BLAKE2B ab459e60e1c25a8eb3cb8afbe9ad1c5c63d1d5bb73626225057e42a9afb61d1bf59b841db6ac61cab2ddb14cdb555f9a789d0ecab7eaf02b1489a6bcf9144149 SHA512 b70c42566559180245afcfa31d3920a7a35817377c60f7c70559625866d54790e9666ba9a366a03bf14feaf1d0e8d2847a526d3976be364d14447a82d148a2eb
-DIST RBTools-3.1.tar.gz 317015 BLAKE2B dccabc93af3a8095f5e166f9e3a31cce52155876cb38675b3dd43b6556024bb9b4ed66291e495ab42b41b09934f136f4eeca7a185fc0fbb2aa2d03e1ef12d656 SHA512 2568aa905dfd119e0b66213e3ae9c8edad5a3337df00228b955006cc85e90c1492e1dc4cccc2695b53f5879103c5d4ee8dba6262112c8781e452dea7633d2c0b
 DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f6a1a17090eb55bbcaf0e8e5f4c2ad6a68a0415acb76c093c99b7bb223aeccd68392877bae97eac354578002 SHA512 d2dbe94dbd63fbd11ef0fc8c08eecbd7000df23388afe21d30151854ff4ef2b3a6c780c60ee52408832a146570a1f7b3f0269fc0c831953e871d2dda1ed8cb3f
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
deleted file mode 100644
index 9e0a68dec7cd..000000000000
--- a/dev-util/rbtools/rbtools-2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,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/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests nose
-
-src_prepare() {
-	default
-
-	# Avoid tests with unpackaged kgb for now
-	rm -f rbtools/clients/tests/test_svn.py rbtools/clients/tests/test_git.py \
-		rbtools/clients/tests/test_mercurial.py rbtools/utils/tests.py \
-		rbtools/commands/tests/test_setup_repo.py rbtools/api/tests/test_http_request.py || die
-
-	# Avoid tests requiring unpackaged test data
-	rm -f rbtools/clients/tests/test_scanning.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	distutils-r1_python_test
-}
diff --git a/dev-util/rbtools/rbtools-3.1.ebuild b/dev-util/rbtools/rbtools-4.0-r1.ebuild
index 160ba02fb324..2b404616920a 100644
--- a/dev-util/rbtools/rbtools-3.1.ebuild
+++ b/dev-util/rbtools/rbtools-4.0-r1.ebuild
@@ -19,22 +19,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/pydiffx-1.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4.12[${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/tqdm[${PYTHON_USEDEP}]
 	dev-python/texttable[${PYTHON_USEDEP}]
-	dev-python/colorama[${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[${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 nose
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -47,6 +55,9 @@ src_prepare() {
 
 	# Fix test that appears to expect case-insentive comparison
 	sed -i -e 's/TEST CONTENT/Test content/' rbtools/utils/tests/test_console.py || die
+
+	# Loosen importlib_metadata dependency
+	sed -i -e '/importlib_metadata/ s/~=/>=/' RBTools.egg-info/requires.txt setup.py || die
 }
 
 python_test() {
diff --git a/dev-util/repolite/Manifest b/dev-util/repolite/Manifest
index eacb915c0f0c..2992346a7641 100644
--- a/dev-util/repolite/Manifest
+++ b/dev-util/repolite/Manifest
@@ -1 +1 @@
-DIST repolite-0.3.1.tar.gz 28375 BLAKE2B b8d42a40c6598c5c626e5a5c8a8cc7967db301a43056018d7c267ac215e01f3ef757495626dfd7e2a0de2093118f38321a668c17a41738d926436dd3e9f1586d SHA512 1786158255ac8ee75fc48c5a8c4ac9b92cc40f74796206498a781aafc4d8b3cee53e1cc10bdb5d5b33341f15d94b5f1373a416de002151362b0844c36024a8ba
+DIST repolite-0.3.3.tar.gz 28554 BLAKE2B 558fea32084d3c6b21a5c9f58797b7429ca1331045931d90ce615395361a25430f3bf4c39415b2355af36f66fed33f726111e72ce81ed9a6d51afed56d42e1df SHA512 8e8c9ad4f49880ca3c83b4e8aa0d97018efc301778ab6ed067a1921a0168622c0f73ad3fe5e98bf81cffb8d59b8a09350cad328e92fb954dc1d6ae04ecf02438
diff --git a/dev-util/repolite/repolite-0.3.1.ebuild b/dev-util/repolite/repolite-0.3.3.ebuild
index b793424dbc86..a600b5a96ca7 100644
--- a/dev-util/repolite/repolite-0.3.1.ebuild
+++ b/dev-util/repolite/repolite-0.3.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1 optfeature
 
-DESCRIPTION="Manage a small set of git repository dependencies with YAML"
+DESCRIPTION="Manage a small set of git repository dependencies with YAML."
 HOMEPAGE="https://github.com/sarnold/repolite"
 
 if [[ ${PV} = 9999* ]]; then
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-9999-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch b/dev-util/vulkan-headers/files/vulkan-headers-9999-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
deleted file mode 100644
index 98928683503d..000000000000
--- a/dev-util/vulkan-headers/files/vulkan-headers-9999-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 419626d4fc27c026c10cde6029a73d717843ac78 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Fri, 2 Dec 2022 23:32:11 -0500
-Subject: [PATCH] cmake: Install cmake files to CMAKE_INSTALL_DATADIR
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- cmake/install.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index c19b5e7..047df01 100644
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -26,7 +26,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION ${VLK_REGIS
- 
- set(export_name "VulkanHeadersConfig")
- set(namespace "Vulkan::")
--set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
-+set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
- 
- # Set EXPORT_NAME for consistency with established names. The CMake generated ones won't work.
- set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
-
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index d0f8e008ef76..591287d773f0 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -22,5 +22,3 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-
-PATCHES="${FILESDIR}/${P}-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch"