gentoo auto-resync : 13:01:2023 - 17:49:18

14 files changed, 135 insertions, 19 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index afa2265b0778..249d2aa10bf4 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index df855a784992..fd724b751b57 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1180 BLAKE2B ae581cdc4b993b6d5dffd3bee84de0783bb7c2cfcabf8ee6c8002e0dc3f1d9db852c6aec5d6b337013f1c21bc6c01faf1fb302de13726f605b9073a42dd3a3b0 SHA512 0ce7afa53731922d731c652ac7b3b0f54c50e6e67a123227587a3d212d70d212257f8cf366b7cea6ff25c5b40936064f6fc404a7d58977728bca9798e8d1ad49
+EBUILD gertty-1.6.0-r1.ebuild 1156 BLAKE2B e4c53d65dc564f808c83f2ef0ebc2ce9d0578b76a818947d316fb6e64e553915c64f60fff61d30c3cdff11973aa211dde94b559596cb7b55755de1c0dded00c4 SHA512 65135a22b17d3158b54fef96a78299dff3db110184c96b444a94d3605be715cb2d24f50abafbad4c69bbaf3bd0a70475b10a02615d4a2be4df3ec24e08269ba8
 EBUILD gertty-9999.ebuild 1183 BLAKE2B db39b0399a9549e7f6292d18d919d73e1cc7189b6485309df90b318afb18b7021421f8df25c05a1077bee7b02d4cedd375ff39210f5d496e4906e50f27246159 SHA512 94d527be70a91ddb417528e671c1e6d04accabe4a9698f1692809b2fa5a4f166c81263fe0d82849db2f9765e7a27a017785dd4a26c9a32a4b8d907056bfe7c34
 MISC metadata.xml 380 BLAKE2B ad29f16ddaf80c092a0ade8008f0234b4c2d61b0676e3eb8ffff7055f0da28a3065de464c912b6345a94e0c189452f7826f70a924ca198a4eed8caa0c0b1dbc9 SHA512 30c0a68fffbedf4900a00bab11299c45dd65994b7e77bfa83ab7dd75f2bc0056b63e63ff2632d30b8c7bffbd4427c8a9b59ebaad3c854e1d4bdac48ffe6b330e
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 81582d8aa357..47ab89ec5b38 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 python3_8 )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0f8b88de3b5b..3bc2745e42ee 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,12 +2,15 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 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-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
+DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 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.6.ebuild 2716 BLAKE2B ee270c3ff0808cc63879896b0e45a8917f8dca397ebd85b6063d8ffca03c599f855be2b83d4176ab6575832ed099e727cf005d4cba748e948d0a854f1e3d4d37 SHA512 5061d9be200b7140f0511a55110e854bd2560bfd44cc3231d9f1c7fe0db23c21a2c434d7c182df165f9d0790df596b2d03844cced969cbb845f9e5a4bf998db5
+EBUILD lldb-15.0.7.ebuild 2720 BLAKE2B 082a58bb73846feabde8c5796c2d430150b43268e7d8416181d830baac0c49f176dbcd759d1572ed7e6a5ea601f5b49ba283edae201828c18a2d12eb24b07c86 SHA512 2dad8e9e5a1611647e4baf92dbc60c3ba5889b3f20ae333151eb57d8649dfddc3da3d280d68ce9164071254953dd686ba0ff67dff179bd0722a53c73514e16b9
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20230101.ebuild 2664 BLAKE2B d585fb85b84194003cdd5bc079480dc6716026e7332567b6127f67b896577b7af4c880f84e8f191d9c7492c4ea5002bdec660bdeba74f416535c27d48783d880 SHA512 1a6bd506a7e7b4bfb0145fc0d9aba2c7994d5b3094f5e9631ff1c34513c36924df90181e5580a0ad2fac806daea3ed2d8c3d32a6494f6078e6ad2b500e2630bf
 EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B d585fb85b84194003cdd5bc079480dc6716026e7332567b6127f67b896577b7af4c880f84e8f191d9c7492c4ea5002bdec660bdeba74f416535c27d48783d880 SHA512 1a6bd506a7e7b4bfb0145fc0d9aba2c7994d5b3094f5e9631ff1c34513c36924df90181e5580a0ad2fac806daea3ed2d8c3d32a6494f6078e6ad2b500e2630bf
diff --git a/dev-util/lldb/lldb-15.0.7.ebuild b/dev-util/lldb/lldb-15.0.7.ebuild
new file mode 100644
index 000000000000..b99a8494e27c
--- /dev/null
+++ b/dev-util/lldb/lldb-15.0.7.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 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.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/makeheaders/Manifest b/dev-util/makeheaders/Manifest
index 446a97afc3d5..a6a4ef6bae37 100644
--- a/dev-util/makeheaders/Manifest
+++ b/dev-util/makeheaders/Manifest
@@ -2,6 +2,6 @@ DIST makeheaders-0_p20220411.c 100587 BLAKE2B eeed8554a444573ae66c479460c3491d1f
 DIST makeheaders-0_p20220411.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33e85700d29b0b539fcb797fa219d9d00461aafdabf2642e2cf1a622cf633cf889d71381bb3342113736ddfdafca3582de SHA512 6cccd5388e8af6f814d735c643abb231dab21a16799fba080858b15885a77b99bf37a5c7bac72958bbfcacea2ed54635ccc6323f5c7d47e2a1a73fffa8952504
 DIST makeheaders-0_p4.c 99253 BLAKE2B 103d4b1d75fb3cb38fdf97dcf051f263c1ee7c08f8d2b4b791994948f0323cbf69fc66840464591ea8596c7ab6857eaf9ddd56bb69f2f035f57d99fbf5444992 SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35
 DIST makeheaders-0_p4.html 35481 BLAKE2B a5e4e4804b612eb164f46cb8ef664952b3f1819a2915e2e905b58e6719cbc7480e4fd2f81f1d1d91b2029b15ed0c9b2c799ae99538b8ad77d49d3606d91b50d5 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597
-EBUILD makeheaders-0_p20220411.ebuild 1178 BLAKE2B 93cb4f4a0ad1777a8138466997292a6d9f487b4c0b044200e0140fe5a858e7597d1568a1a8ea33a1036297eb682ea545f8b4a33a730d4a1c261c594e0fd87dcb SHA512 e04adab2b9e99d24e4de9e47fc432841150204e0d7f880588e37d18b543c2af92bd7552d33dbf1d92c8e51ddc66db92e3aa67ab11ae7df0a07702668442cd9ba
+EBUILD makeheaders-0_p20220411.ebuild 1176 BLAKE2B 7bece779ad96d2b54cda9b9842a0ac383bf50700fc7d9db13dbb77c274cd2672e0b2c93d20eeea62d92304cad07f951ef0f1a025c097aacbcd7268ac981aea7f SHA512 4190f9110293c2523b25bea0d1422eabedac52fb1e1817d47170477577c9b80dd1ca83b0c91b30e460b3f0799b82830930fda7a2e155956b7282ae6ff0b72a5c
 EBUILD makeheaders-0_p4.ebuild 658 BLAKE2B 4262d895536f636a1037d784ce6ee55b28582f94820a6651e57e4bed44cf4827883483472501313139f515068015a949e6c1df641431bbda51a0448f57e8210a SHA512 3119779bde55879cc88056259db02233ac57e55f7c8b6d1fd7b6ec348b30f5677df0370987c66b9738cd2cdb3ddb3d8250366318482d80a3530f5bffdcbf7465
 MISC metadata.xml 957 BLAKE2B 4faa7988aceb8b8e447b004aeee96c925a1f458f252953e5b2ae50e09884168936f1b229c5fbdbdcb46bcde287e2bc98971cf7822af77bc0db17b09b4491d99a SHA512 50df46503a6dfa2d61cf628e07e06355759abce269012db8603fdba32d7d31e95e5e9fb08c6c10c2e10a46af0a62f666ebd19c5b932063a9f958068ed4f5addf
diff --git a/dev-util/makeheaders/makeheaders-0_p20220411.ebuild b/dev-util/makeheaders/makeheaders-0_p20220411.ebuild
index f0e3367f1df4..83211402e0ec 100644
--- a/dev-util/makeheaders/makeheaders-0_p20220411.ebuild
+++ b/dev-util/makeheaders/makeheaders-0_p20220411.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 HTML_DOCS=( "makeheaders.html" )
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d427ea9cd3c0..b5aec7abe7c9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,7 @@ DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610 SHA512 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
 EBUILD meson-0.63.3.ebuild 2978 BLAKE2B 7e3c27064fc4bbf116a7fc5efaf9d56bf942567b0c674c70c832826a557edd458a29ce0dbb445ab5b4e04cad03236798ebc499aab4c5edcefd7049d84f1e862e SHA512 176d0bd3a9f7b4aab8614ee10f5b7b18c5d8889c7a07dd7f49b283b01e72ae7c878108de8e135bcdd60d5563a51d6c62c44093f6eb115676087c9fd073ed762c
-EBUILD meson-0.64.1.ebuild 3017 BLAKE2B 996bbc0174b23d85fadaf889ad4717a60684a46d0067a7019ffaebe4ca351feb55f72a940bed27e6296ab1aea6b5cb806e55c0f0185a60131b7f2691f1f5208c SHA512 3090d84bdc0f1a3deb196735327bca6f9154b78b9f4d610b90fc1d992d3861e51bcc6520fafc8d849abfc586c779be63d7bedf20dbf3733b5537493d935355a9
+EBUILD meson-0.64.1.ebuild 3016 BLAKE2B 3c0b52ec2a15e9c89408769be907e96c5538d977c6f16e1c8cfd86e49cfee3316f57c1af1d9aacc0d391896bcab2580ab6da215db3939559f70dbf95adf33782 SHA512 6ba7ddba909d791dac263a19e11a8e40c41889a39110ea3ac8ff1dfe6130ccda726cdd69f698abe90a5a550dc6ac862f0b2e7e2221458ddd5af8855fed2a8308
 EBUILD meson-1.0.0.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 EBUILD meson-9999.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.64.1.ebuild b/dev-util/meson/meson-0.64.1.ebuild
index 89a3cad3630d..5ecbeec8fd6b 100644
--- a/dev-util/meson/meson-0.64.1.ebuild
+++ b/dev-util/meson/meson-0.64.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 fi
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 09d344442f5d..7ea2e2720f34 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,5 +4,5 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD perf-5.19.ebuild 7955 BLAKE2B 23485624229d577c2c97f5009b715397be75dd5f7b672124e1282635293a0104905b7d1453f7e725231b88862a6d5060592e9d1d4fd37a744979ecdc5375b1e8 SHA512 eb86385d7bc1dbf18ada96ce1614c5ee985e3483a4b64c25b4ab86eebd6a08cd05b21a5538806fc99b0be40c4d9f330241b45db3de7dcf732cd16dfd429343eb
-EBUILD perf-6.0.ebuild 7333 BLAKE2B 5f4b1fdaba45f08a1dc10713e59a590582099bd83f633e91a6ed705a3f6c07417d47723fcfb02b061c77dbcc0bc5cbe1e6f9d5602c5af18bf6c9fb227f1cf4a5 SHA512 6cd06a022eba4eec64a85235a01756d359eee818ac68d02622c0e1756b3f3c2602697a6dd0defc3c62ddb91301941044b39d05a96791d6c7051af273ddeaf35e
-MISC metadata.xml 1495 BLAKE2B a85be66bde5edad744c83a0fd90bc9c93f87c96b804509ce21514915f02a4b32be0f2383105a25b2d076509b0bd902f9d630204f3bcb59e777426d88d50dfed7 SHA512 c672503c31391f0411de15996a22968a6a1301fd63675329649e8fe0304c32b2c008270a8d923650a60809026426439807e54ab41501497ac6a81e81adc23b44
+EBUILD perf-6.0.ebuild 7370 BLAKE2B b42d4e57bc8fd7e8cd3f0d3a1c8a584ca7d60d84ba944b99faa14f682c0476b40a32b3369f105c3ab0c237ecac3b8892778318bd4a6537cc1af5059c81707b2d SHA512 8d0fdfa708a3cfef59d3ab684f258d07f0cd0d334a5cc4104ee461464d1aa736722d2c7b669fc7baa83da9b06db179a29783bab5eb56f80cb4f0a608bd855678
+MISC metadata.xml 1381 BLAKE2B 99d6c9db46b79ad7abd993c123f826dbe3f5e7c33fea98139a7fc694fe4d81e67887873e9edb390d63e65ca351033a8bd62d799fac946e2334188c2a4b776328 SHA512 a952ee2f4173bd2957038614c6ebaa44ff20bcf57f83f8fc5eabbaced667a7254a3e326e0fca541f1ce10bcc4e1d0df0b46600268bf38baf39bb2dda2bb3e41d
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 5ebbfb8b496c..a363827ff153 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -13,10 +13,6 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
-  <maintainer type="person">
-    <email>zlogene@gentoo.org</email>
-    <name>Mikle Kolyada</name>
-  </maintainer>
   <use>
     <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
     <flag name="clang">Enable builtin clang and LLVM support</flag>
diff --git a/dev-util/perf/perf-6.0.ebuild b/dev-util/perf/perf-6.0.ebuild
index 7436087635dc..0f780281f20f 100644
--- a/dev-util/perf/perf-6.0.ebuild
+++ b/dev-util/perf/perf-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,8 @@ src_prepare() {
 		"${S}"/Makefile.perf || die
 	# A few places still use -Werror w/out $(WERROR) protection.
 	sed -i -e 's@-Werror@@' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \
+		"${S_K}"/tools/lib/perf/Makefile || die
 
 	# Avoid the call to make kernelversion
 	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 219cabf20e16..1e82df6be4f5 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -9,6 +9,6 @@ EBUILD systemtap-4.4.ebuild 2885 BLAKE2B afc4119402093613c0f9bf203b1bd3ef89ebee3
 EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B 7b1951cb0bbf78977836940baf2aebd893d9bccf6313776c728b0b739260a6e745200689b22a3a02ea99b1f87222edf711bc9ed6d8419516b665da9df1bfc47f SHA512 5f68f7134496ea36f4d2c3d35e74d404a6be1024921631ed12ea502287b0350a4237d862928df98a85d4fcd476a413b7f1339a4d282f2c1b8569556590321f8d
 EBUILD systemtap-4.5.ebuild 2821 BLAKE2B 71a279d9542fcea1ce4e2812189015adef3a65026fd5d97ecf939322a3dfcefd2ce15882ef39ac7a82230df935c4b1499ba67a805b00d86d7565f690c4864339 SHA512 d01b80a08d21b671bccfe4d1533886b94a0ad514f6e5da9c86f9d5900d7d9235db9d51a254eebbb5ec9096beb14ddc34cc8d75a82e707046e2f1c841d5594449
 EBUILD systemtap-4.6.ebuild 3264 BLAKE2B 8f21b747189a1a818aea0304c7b13fb0e54ea44127f510af8fad195ab70d7c0eed23c4037d6d7d4659be911a67d23f83c77d21e6e66f3db0d10e7382f81b7f3f SHA512 c25d5f4f7412518ea904b8d512060264df60ae06c5ac10b310dc2a700322c043aa2e89ce33e10cf71a6ac38de51b27ebc899e27fe5ccfd5058a7fa09079094cd
-EBUILD systemtap-4.7-r1.ebuild 3281 BLAKE2B d4a09ebd804780bb4e6b611adbf37e752d0378cdd696dceb05426dfff6f857a6141a5e47b9839a41992b748816bcb41fc50cf7f17e310828446ce17ea6ba4f37 SHA512 fc8143ea329eedc28e79e7b4f4f126fee77067d31a3a11572d56878883cbcd15146b6e7ee42976520beac4bb8c000a2ec9ff96fe563cda5e936870c71774d18b
+EBUILD systemtap-4.7-r1.ebuild 3280 BLAKE2B 07e4ee992f6b22296f7baa8fa14a53b8c54e229b9ccd4d1f0a8a7aa659c43efe54145de2da324785ecca6152b5bc6c53309d151a873e8d68d030933098a5b4da SHA512 3f00245dfdd8d96bfb03294e9dda741d66f7d74214623a1506090823cf6812a6b10b575dd163dc03c72b345a82caaebc82cefe0c0908918e4a2c2fcd542b3b2d
 EBUILD systemtap-4.8.ebuild 3287 BLAKE2B a610e1309dfd2584d8b321e03a6a5875f98dbab2476e5defd355928696174cbb3444001cff78b5970c8869d7acf9f47036bed81c4c0befd2cbd1f5a7e376275f SHA512 5985d2c420f68c7aa133d4257cc0c492609e3b998fb67b22d69d0a0dafb449ef5503eba33947b5c89952ffaa0355d255eed8768f8fee671d0ecb6460a6832064
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.7-r1.ebuild b/dev-util/systemtap/systemtap-4.7-r1.ebuild
index 2b6073415d25..a83e397aca97 100644
--- a/dev-util/systemtap/systemtap-4.7-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="