7 files changed, 196 insertions, 10 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 72ac665df2ed..0f6f67c20a49 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
index 520804dce879..0c6d3f4b3bb8 100644
--- a/dev-util/duma/Manifest
+++ b/dev-util/duma/Manifest
@@ -1,5 +1,5 @@
 AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
 DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
 DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.15-r2.ebuild 2276 BLAKE2B 4ac38d95deabb12f4d1066fc6e304726d222da03ece0cefecb2e258965fd6f839d7530a4b6ea9640fb3dad4655b499af31ea4579a08a947425198241612ee486 SHA512 28597688146092c8b2d7dc452ddb5d1b19e036148708e72106baf842b1e4d7eb3ea87a7543a3f511468894032813224ebe76a8938140e9973fe2a44795bf887c
+EBUILD duma-2.5.15-r2.ebuild 2164 BLAKE2B 874af08391bc86a738ace9f910d25eb569c52d63f595219937ff1ad21c91dd740c125ac131ef7d792e6c2ee33415447f824b11e49ddd378c6b8c6d15b33b1580 SHA512 3c96d4091b7fa885cbb663918793cdbff95214194b78ff735d415c01ded4f4d5cf300f6481c40b6ef61a36b8e62963d97823c3c79442629e87d19a5e31bdeba8
 MISC metadata.xml 601 BLAKE2B 1ae26b4db7d716fdbefebb00f48fbd98d61370ac262db216fd8ecece69fd2965dffcc65f6ce424ef017217da320789ca36a354e7a78bf07aca8dfface6af9d1b SHA512 9ce897f1db885fe7909d582d3b3dc12d8e4ca97822d2b1fdf3c062fa3f4982145d01d120832edb1bd9927f7fe66cf2282b6028497bc88dc8c975aa0531d9dd7a
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
index 92aff79a7b79..0a069e304e5d 100644
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,14 +38,6 @@ src_configure() {
 			OS=solaris;;
 		*-darwin*)
 			OS=osx;;
-		*-freebsd*)
-			OS=freebsd;;
-		*-netbsd*)
-			OS=netbsd;;
-		*-cygwin*)
-			OS=cygwin;;
-		**-irix**)
-			OS=irix;;
 	esac
 	export OS="${OS}"
 	elog "Detected OS is: ${OS}"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index f8e852c5f8a8..b54c84921d82 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -8,6 +8,7 @@ DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fb
 DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 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-62c0bdabfa32f6e32b17b45425b15309db340dfb.tar.gz 190948645 BLAKE2B f41d8ea32e189ef4641e42628fb516e307c9a6fcf65af537eb9fc0d3186591b062c5e85c9e935511ef706f28c6994a774a4e3f36ff54d79aaac7b293a6168625 SHA512 55a4cbfec3a496c1918aa614e5bdee368e4d0b6641c946d8bf8b828ab4bf4d9b29dbe96401a172079d70f924f5e513428fe990c65b556a0a860802cb13f5e3a0
 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
@@ -19,4 +20,5 @@ EBUILD lldb-16.0.5.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3
 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
+EBUILD lldb-17.0.0_pre20230609.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230609.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230609.ebuild
new file mode 100644
index 000000000000..bc7ef862dfa0
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230609.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/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index a75f281e5011..3d13b97bff44 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -2,7 +2,9 @@ AUX trace-cmd-3.1.4-hang-make-4.4.patch 3094 BLAKE2B 7e2a83981b214125daff015b464
 DIST trace-cmd-v3.1.4.tar.gz 328452 BLAKE2B 6d3c964d1ba585213b75834b1037449464e5d54e5f49ed5b532cc599f6b960b79d0f0327a6af38e38b3471b54316810d9f05ef6cc7a3a4e39ee7eec9864e5ef9 SHA512 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8
 DIST trace-cmd-v3.1.5.tar.gz 328689 BLAKE2B ae77b418505c545ef2b701c484cec944b6d8b9e7b0df9ea0a6475b099d59997a426a4c3f69fc2cfdaaaa4280f5fc53b18caf7a39011cd980fa331122f59feb13 SHA512 7262e69a990986975f0ee9287b16afc48f4f481fcb54ce64ca51dbba2e4c8cbb3c7c7d3d888aba10f3b12ac6b1cf9e612dd98982dc8d48ea221d231e3d16ac4d
 DIST trace-cmd-v3.1.6.tar.gz 329041 BLAKE2B 0f5adace645f8598b11c2f4db4c0f6081fbb60bd6f27bf5b2d59d2ab5279a3f4ed065af924ea7204df206295408167e9a21924f09254d7d4daa8f07c53f77967 SHA512 2504863556a86759173f7114f5ab9a1d5641cefdd2bc9af64d8e5232d175e9c946fbb9dcec00d91b903e74b0e1bc52332877ddc9b705d6cfe2af9cb39797a446
+DIST trace-cmd-v3.2.tar.gz 342848 BLAKE2B d82309b72d00ae1b757039c7a358e7703c9e74527112baa05eb44f971067b1189b7833621766fdf8affc812b84b7bcfd071b2946495197d81a8ed8ff7240779e SHA512 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442
 EBUILD trace-cmd-3.1.4-r2.ebuild 3338 BLAKE2B b9c5437bca8b2c52bbdcd86c39db0b1bd72d7fe39028b5ee0317c0ce3d7c9eaead454341ab8dd7018b30601dc335e22fc0bcca6eec23a5c3a25c6f075495b1c5 SHA512 0f91d5296079c7143cc58be2348811bef0adf4bf65242612f6971c74bc6d63c203b401b57d76f1571b56e9f019f8bce7dea280a2a8235b5da36290f4bb06dd00
 EBUILD trace-cmd-3.1.5-r2.ebuild 3353 BLAKE2B b686d73cacf84e8d569fe2085146ce99e255873c3f5942de9f9c6eb95640319c3ce2bb58587e876a0ccb6ffab97effba80f8b74bc36aff028188f59f360b05da SHA512 290a7844d5e7cbf7a2fccb8b8a1e40ee08687c121ee6e79066b2baebe65afec7f87759e142795ce2dd5f39f2d3a70affa96ad29a93ba66ab6f186e638aeceaf7
 EBUILD trace-cmd-3.1.6.ebuild 3293 BLAKE2B 7903d1794f4a5fbf558ddbbee4b3359359fb6d6e1e447abe76df1ab1358543df03186c2ad6c0f2fbb86bae0c1cf6a3fefdabd1a2d626b403c19f229436f87f66 SHA512 92f661d066e9aa88355de47e83de57801facc11971bd1b93639ec3db94a0c508ec8aa97775d42bc0eda1587993a33704d68be9404a4f7a18ef991fdc43306c72
+EBUILD trace-cmd-3.2.ebuild 1801 BLAKE2B f7952990a73ccb0dd5644592c6de060d7f7df73527290c417628c136a52c079cee68e7b67c1cd0605c5d20cda7bdf2c5059cb1fe2cf7d05a91e53af9ad0c7b15 SHA512 d3d676f1b553e67a14e28e715c5e9a483a393105944d21d7a859fafbc69ad8a1b7ae2b1fdbf989387c954293a5ea2d8355315b2bb362d51b1c7c3ef1a97bc83a
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/trace-cmd-3.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.2.ebuild
new file mode 100644
index 000000000000..0faa6c63b891
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit linux-info meson python-single-r1
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Tests segfault for now?
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=app-arch/zstd-1.4
+	!<dev-libs/libtracefs-1.6.1
+	>=dev-libs/libtracefs-1.6.1-r1
+	>=dev-libs/libtraceevent-1.6.3
+	sys-libs/zlib
+	sys-process/audit
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	app-text/asciidoc
+	dev-util/source-highlight
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+"
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+
+	# TODO: Once we have options for doc+tests, we can revisit Python being
+	# single-impl.
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+		$(meson_use python)
+	)
+
+	# TODO: udis86 isn't wired up to meson at all
+	# TODO: get docs & tests optional upstream
+	# TODO: audit/zstd/zlib lack meson options for now. Previously, the situation
+	# was somewhat automagic, so this isn't a huge loss for now, but we should
+	# upstream some build options for these.
+	meson_src_configure
+}