13 files changed, 128 insertions, 34 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1a6c195abe7c..78a169acf576 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 13a5881bbc1d..362e5bbe59d9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,12 +4,15 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
 DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
+DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
+DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
 DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 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.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_rc2.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-16.0.0_rc3.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0_pre20230211.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0_pre20230218.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
diff --git a/dev-util/lldb/lldb-16.0.0_rc3.ebuild b/dev-util/lldb/lldb-16.0.0_rc3.ebuild
new file mode 100644
index 000000000000..985e9ba9d42f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.0_rc3.ebuild
@@ -0,0 +1,115 @@
+# 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)
+		-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/perf/Manifest b/dev-util/perf/Manifest
index d75e57e02776..a1d093195c7b 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,7 +5,7 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST patch-6.1.11.xz 717696 BLAKE2B 57033764612efc0a173f501036ccd6cc4fb1ddb452f40d3d81cfea7c3d918174a6b242490fbb8b0c66eb91c4e6503b820b0e77ba12c3beeea95b492b662f3466 SHA512 3ea57aa49805a2ed9521b11237e70e2df68cff5c3215e5e047ec292daaa1caace6747219fbec6cdef84b099d607bc59ac7f9a7e72189fc269945586ee16ab899
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
-EBUILD perf-5.19.ebuild 7955 BLAKE2B b3a22b72e6deddb2f293e6346e639429791e5706cee770bdec14825ff921b803640e0f6c7c966f762c45dfb0489cf5d5eaa9c2ac6924f4ed508fa1876b4e775c SHA512 bfcafafbc770caab5e0bc8f0d007381567429ba32c9225cdcd4ab3d73623a69d21a62e1ebe15230004b4d2a19165d45c3e277347d49359fbc2c3497aae22d60b
-EBUILD perf-6.0.ebuild 7370 BLAKE2B c59350ded7bf82d34bc05040272a8f10b467261215aaac17423281817d06a591bf64b32295b3835b3b0cc711cecd17e445eaf5975b21e46d31941d04adec8212 SHA512 8ec8941663620c49060c5534bcb37d6e82728a5869e83512035ca0211af1e3d1b735356fe48b5cd224928ac32491107e02db8a43a76e2f2450b107dee236db64
-EBUILD perf-6.1.11.ebuild 7374 BLAKE2B 4a5401aeadca11a8abdf5deab3c962a2db195288563f42136fd6cb594a94527df04541f8224b19de63e610dc389d84ab489f1c785a4704ccdabac2b04827e79c SHA512 8a5187ce7eb4f22442981dd6082230df7e94994034a9e0171c85fc3a29f6278555b8e9abde23650f3eec9b8d019c266a9089e30f800ca08c40a4bf2c8e85f845
+EBUILD perf-5.19.ebuild 7956 BLAKE2B eede6e0446e379027b40c9a4aadb22dbec3d5930836ca3576f3716a37b825b8fb78e6293a02b17e18e9f304fd40f99f954e4555857ff652504717baf124a4243 SHA512 cfd4150028c7c9b9d57897cc391c60bd8bf6d2b5520a0c7e4ef043d3e7847c9809b7267a25931124393f796511d99c3561e7e298cb58f18bbd36d3321b733915
+EBUILD perf-6.0.ebuild 7371 BLAKE2B 6188da4d0eb313fcdfeaa68cf177e20b4b84c29aa312685c3f957ae337c43e513a20b054066fd8fcc2c89e46c9380b8a01a571f89b0a1ac213f7d61560923769 SHA512 789cb6b9814691159f55e4495dcaabb892f13d96c5db5975026c1a748a926855b8d1cce0ae99eee840eb3819377890aed021a12b9ac0505763ded614f29c2f6d
+EBUILD perf-6.1.11.ebuild 7375 BLAKE2B 8d9bc60a5d670a20ef49af7a605c30af5a71a0e2a39919bf83ce643095b9a50a16870445c1b8e4ada6bd0cda11509d66fa164781d0a68c6b4bfbc7ab8ba752c5 SHA512 2ebc126b936b30ac0eec3a2f90d909963c27d05673e9e1dd0ddb38b434e48f435b1ba502b817af552b2c85cf30e3c3fc14e4767efb715ba7e9ff6c22c36f2f24
 MISC metadata.xml 1381 BLAKE2B 99d6c9db46b79ad7abd993c123f826dbe3f5e7c33fea98139a7fc694fe4d81e67887873e9edb390d63e65ca351033a8bd62d799fac946e2334188c2a4b776328 SHA512 a952ee2f4173bd2957038614c6ebaa44ff20bcf57f83f8fc5eabbaced667a7254a3e326e0fca541f1ce10bcc4e1d0df0b46600268bf38baf39bb2dda2bb3e41d
diff --git a/dev-util/perf/perf-5.19.ebuild b/dev-util/perf/perf-5.19.ebuild
index 69d09a7dfbac..2489e3b3c6d3 100644
--- a/dev-util/perf/perf-5.19.ebuild
+++ b/dev-util/perf/perf-5.19.ebuild
@@ -114,7 +114,7 @@ src_unpack() {
 	# We expect the tar implementation to support the -j option (both
 	# GNU tar and libarchive's tar support that).
 	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
 		"${paths[@]/#/linux-${LINUX_VER}/}" || die
 
 	if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/perf/perf-6.0.ebuild b/dev-util/perf/perf-6.0.ebuild
index 8835f1febde4..611ca8224448 100644
--- a/dev-util/perf/perf-6.0.ebuild
+++ b/dev-util/perf/perf-6.0.ebuild
@@ -113,7 +113,7 @@ src_unpack() {
 	# We expect the tar implementation to support the -j option (both
 	# GNU tar and libarchive's tar support that).
 	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
 		"${paths[@]/#/linux-${LINUX_VER}/}" || die
 
 	if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.1.11.ebuild
index bff4ba7118b7..c9df3f9793cf 100644
--- a/dev-util/perf/perf-6.1.11.ebuild
+++ b/dev-util/perf/perf-6.1.11.ebuild
@@ -113,7 +113,7 @@ src_unpack() {
 	# We expect the tar implementation to support the -j option (both
 	# GNU tar and libarchive's tar support that).
 	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
 		"${paths[@]/#/linux-${LINUX_VER}/}" || die
 
 	if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index b922a75efdae..f31776aeb7c9 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -396,5 +396,5 @@ DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a6
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
 DIST zune-inflate-0.2.50.crate 37058 BLAKE2B 6e6686708ce4f83dc753cf93af7304e177568fe77dbef5b1feec6b38731da7ff077a2b1e02c24e270e013066c240c2a936b8a25a5a0a79f9f242831c1b46a810 SHA512 02fa9bbc4a30e145f034581212333788a24ad9756b1d2efef3a8b6967389fcb4258fe5c71936eb16b75238965021ae796525a754a94ff96d2d45f4e0509f74c0
 EBUILD ruff-0.0.247.ebuild 10023 BLAKE2B 030a6964d060a0a421aaab1145ad44cc0ad4c6719feffc02b1fa3633536d1cce5fe830564525ab752a902bb3a4e21f09d5ed92d5ea140d6591252f44f929636b SHA512 8a7c19cfd45cd692a2155f9503f03814bf5980cfc0394c1d88feb73500a5b2a4053dd75ebf6c79853f7aa116688fd05694102252b23ed52920f9e5d86b38148e
-EBUILD ruff-0.0.252.ebuild 8702 BLAKE2B be57bb3227c0efcde8f95338dcb753a69086bfd8c75750641a355e52d5292b34a15feac647a1761d16e4bd14f6b6600e933209a45bb07a6705235a91941da37e SHA512 be5d961e2ce5ff7161ad4a25bbbd6b8e83153e32c39dd39bfe97cca76b2d9cefa14b0bcead222156842be70e302267fa790cf131731da814303f33df22696878
+EBUILD ruff-0.0.252.ebuild 8703 BLAKE2B 0ffbd3e95c2fe7333f93caa1feabf8ba56c4b344030d6aff12e2ce0a0710bf3b2349c24a0a4329b81fdc1250a39ca79226f646b9af43407e94b349965e88c68a SHA512 7e39ba6d47325f573f030a3f67567ba2e9896754d78be602d08eb4ce90ffd5ea4459b545970621a4a2f3a9318ed1a56e6000bff3eecd502a8686ab0bd966e53f
 MISC metadata.xml 375 BLAKE2B 46856b904e322f25ebb96268418206fb70b76f22751c5f8c12d0b3fb51a11b91518c42313d8a9f2fbd71dd5a3ca359772f54829a7858148c5f5f03f44fe1dad4 SHA512 ad24b0cafc7adc414a0da36f5b518eacbba3069ac15484504ce063916133e7c15945c04c7c6886e30c75010300598876ab498d5d44c48f66c5ed252f3fd2f36f
diff --git a/dev-util/ruff/ruff-0.0.252.ebuild b/dev-util/ruff/ruff-0.0.252.ebuild
index b0c70b030c83..060390bbcc30 100644
--- a/dev-util/ruff/ruff-0.0.252.ebuild
+++ b/dev-util/ruff/ruff-0.0.252.ebuild
@@ -359,7 +359,7 @@ BDEPEND="
 
 # rust does not use *FLAGS from make.conf, silence portage warning
 # update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="usr/bin/ruff usr/lib*/libruff.so"
+QA_FLAGS_IGNORED="usr/bin/ruff usr/lib.*/libruff.so"
 
 # haven't been able to figure out how to get tests working yet
 RESTRICT=test
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index c27ff471d030..7c965a268043 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -3,5 +3,5 @@ DIST stripe-mock-0.150.0.tar.gz 564931 BLAKE2B dc67d9c0547d68d70bb096ca7fc498521
 DIST stripe-mock-0.151.0.tar.gz 571906 BLAKE2B 3cd9bdf28b608506b649f2f93270ad7ea130afec9dd0e707537b588ce5ad7b7f16b51cfc10b7c3005552e2a8fe895ca2753d1136b04be1730602514110f96853 SHA512 a492be91e1e77b13862dc02d2520b958e3c12ed06318d02d642eca9dec6044b2685ac50982a421d798d615ed59da947eac0ffc2f3cc900a435ac1eb0a941a9c5
 EBUILD stripe-mock-0.149.0.ebuild 498 BLAKE2B a8e1dd0ac1f07195ecdadc4d5e68499e6d48ef5ac47fd770a7a421cc6b8fdc035bb1ae7c4f0ee7028c7ded5dbca4f260499f4fabb58d80794e807d6206232b1e SHA512 9fc51687f9fad3ac4c9c505c4a5f6b7bc668acd17f186bdec61a13cb4eb0b8d024b3eca7717434c6720f7ae4bd89431a7916575492700ad9dd9f86508b85d007
 EBUILD stripe-mock-0.150.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
-EBUILD stripe-mock-0.151.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
+EBUILD stripe-mock-0.151.0.ebuild 498 BLAKE2B a8e1dd0ac1f07195ecdadc4d5e68499e6d48ef5ac47fd770a7a421cc6b8fdc035bb1ae7c4f0ee7028c7ded5dbca4f260499f4fabb58d80794e807d6206232b1e SHA512 9fc51687f9fad3ac4c9c505c4a5f6b7bc668acd17f186bdec61a13cb4eb0b8d024b3eca7717434c6720f7ae4bd89431a7916575492700ad9dd9f86508b85d007
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.151.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.151.0.ebuild
index ca0f4e60efa7..6c666b489577 100644
--- a/dev-util/stripe-mock/stripe-mock-0.151.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.151.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_compile() {
 	emake build
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 5b2629c149d9..77a683e2a386 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -1,7 +1,6 @@
 AUX watchman-2022.02.28.00-libatomic.patch 2254 BLAKE2B 4eec2caf20f9c892bd9d2a7961da35cf79b606bc519a7b0b725b41b9fe844f4ec9ebc8de233565fd4889c492b7c3b45581e00e6c90ca981f37bf3f047f93f577 SHA512 12fbe5afb62008c97a60340ea05a148932ffe9428f2c0114fbe2fccf7ff428aa43e6a0c856edb78ec1a0d81cba92dd6cda92a079c24213e77b69d6bb88a25b06
 AUX watchman-2022.07.04.00-python-working-dir.patch 2455 BLAKE2B 3a8c37f87884caae46d87194d397cefd6f1d58d78d22f3cda43bde3a5262a9d88dcf8f1747790786a889384ee5fd0ed2507ed2faffd63f338e08b445aec2876e SHA512 9c7bcea9502e5fa11e63ca3b0fb0132a67512beece934becf9a2ebdc1097f29b7a454a22c519f801779da8c9e682d2d306fa79e2f38cc1d21aca21d3a25151e1
 AUX watchman-2022.08.08.00-musl-fsword-fix.patch 908 BLAKE2B 79cffe220bde36cada12da0136f7e696151f59763cf07a774fd4da800b362b1943ed99e773751e9e4ff9aa2537812a975f166bc1b60790e22b90e329ac8e5e82 SHA512 82853ce11da25f109c1e58e16d4bdc81d8a4824865763d036a95ac6a2c49077443ec41b1bd1f6c30cfa55595413dc9b6d6c7c69c4bedce9d82cf32de3909cd7e
-AUX watchman-2023.01.16.00-gcc13.patch 654 BLAKE2B c356870521297fcb19c0810607c91e0544d65c9d95c9b30378e12e07af9df7b99c34b5846ebcc937df00321382e3152b02c77023ef0981a83c5e4052981fa9f0 SHA512 fa1931446e89a7b150d04b4e32ad30b776dbfed9195dcac135bd0bf5f022a14aedcf471f07128891d7cc49a5d9da396a38afbcef5417fdb16890a50d96ab8671
 AUX watchman-2023.01.16.00-python-working-dir.patch 2270 BLAKE2B 169486ea5b0a585d33f177a4a3746ab0ae5b1fde239cc7fb0ad832ec8946de1d1d3b6b4d3344b0c8552fa4fa8e88ab4ba9e820aadbfafd7fee5d07aac51ce059 SHA512 b46d710fa00ef75f4331fd2451b7faa9edb5901f5b35fe8e34b05931064224d5fd29033b3ab7132f25073a2cd8a8294d673cae2ee88962ce1e6c877597ef5ca1
 AUX watchman.tmpfiles 32 BLAKE2B 88c6a5c4b1d7a35d4ed485ab1e7ba0e18a8433d176318f69e77030d4980931876fdd8d1811e0af8c924c89c358cffb7cc9ab4effbc363cfae8adc6d88597313a SHA512 5c4230d23a045704efd5851abe0cb4c6e9eba91e128bbfc677e231868ea161364055fea65800a9b8bec61d95c6a2824dffa536755e12d3b6599a81cdea5c063b
 DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
diff --git a/dev-util/watchman/files/watchman-2023.01.16.00-gcc13.patch b/dev-util/watchman/files/watchman-2023.01.16.00-gcc13.patch
deleted file mode 100644
index 20c70d29e28b..000000000000
--- a/dev-util/watchman/files/watchman-2023.01.16.00-gcc13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/facebook/watchman/pull/1089
-
-From 6535e011af5b89e9aa2a6faa60fc862f36f8b483 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 22 Jan 2023 05:09:25 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint32_t.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/watchman/Errors.h
-+++ b/watchman/Errors.h
-@@ -8,6 +8,7 @@
- #pragma once
- 
- #include <fmt/core.h>
-+#include <cstdint>
- #include <string>
- #include <system_error>
-