gentoo auto-resync : 04:01:2023 - 12:06:28

16 files changed, 170 insertions, 325 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d71a2a559a17..d1f596ad1996 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 92c8218b0a64..eb085eb88ad3 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -4,5 +4,7 @@ AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751
 AUX bcc-0.25.0-cmakelists.patch 358 BLAKE2B 0159aa6e483bd5fab0bc920e8416a94a43809d99a29344b17321bc92890614f99cba1bb8bea02522b890be456904250ef2875d2d88b3f6d55022ad2d4ad2910e SHA512 9521e22cb9318b56601e1d27362903d63fcd8954b7539e6e92db267406d8aed6be8261b62f02d186edb82d548d64578bd99674f93c86e36e1fdd43332dc1552a
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d
+DIST bcc-0.26.0.tar.gz 5255485 BLAKE2B 934b63148dc1e4f017ab97681c6df69c9d5ab1db44c2bb1608644e1d91b745c25759fb1a6c5c543888e23a4e0c4a2e5738b772e0b02ea9901f8bec1a8b15cdd3 SHA512 394872a5780cc7651c91b584ccc13f18f64585b5843364433c042d9ded70faaf15a2e1125d51498508427b089f5bf826f13004d15a1892aada1a5f228a2a8adb
 EBUILD bcc-0.25.0.ebuild 3063 BLAKE2B 2d17d42ab8e990464edc581a9b000b5e84e64a435612cc8fd85cd5c1ee6449a90bc3c0a7b4a9fe8effa471ddbdcb4076c2319905a7c03c63997eaa438854fa82 SHA512 b5002cd2ce4e33fe9ccfce8fa4370e8697860f23a776b2a276c5607902176599084afd67a81b8b655ff4d3c343605d91eb0328a23b1a0c7a102af8051b096a85
+EBUILD bcc-0.26.0.ebuild 3063 BLAKE2B 2d17d42ab8e990464edc581a9b000b5e84e64a435612cc8fd85cd5c1ee6449a90bc3c0a7b4a9fe8effa471ddbdcb4076c2319905a7c03c63997eaa438854fa82 SHA512 b5002cd2ce4e33fe9ccfce8fa4370e8697860f23a776b2a276c5607902176599084afd67a81b8b655ff4d3c343605d91eb0328a23b1a0c7a102af8051b096a85
 MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.26.0.ebuild b/dev-util/bcc/bcc-0.26.0.ebuild
new file mode 100644
index 000000000000..f4e7887f0085
--- /dev/null
+++ b/dev-util/bcc/bcc-0.26.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+LLVM_MAX_SLOT=14
+
+inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+lua test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# tests need root access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/elfutils-0.166:=
+	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
+	sys-kernel/linux-headers
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	${PYTHON_DEPS}
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
+	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
+		mv ${script} tools/old/old-${scriptname} || die
+	done
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+		-Wno-dev
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=1 )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+	python_foreach_impl python_optimize
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+	local -A rename_tools=(
+		[trace]=1
+	)
+
+	local tool name
+	for tool in "${ED}"/usr/share/bcc/tools/*; do
+		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
+		name=${tool##*/}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+		dosym -r "${tool#${ED}}" /usr/sbin/${name}
+	done
+
+	docompress /usr/share/${PN}/man
+
+	newenvd - "70${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/share/${PN}/man"
+	_EOF_
+}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index d60cc13348a7..1515357ca7cb 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,17 +1,8 @@
 AUX 22.0-fix_build_without_leveldb.patch 683 BLAKE2B 471da86970257cc9082c57504e4a571af9ca70a869aeefd2c59ceaf25680cca75c209cb14658bcb3323c372619cf008ba0a019e89bbd0785886aaf47bf8a48f3 SHA512 1c5aa6a181b404d2b6ae5f820f074c5f27845102900457d88857a2a4bfcb21830ff970cc3cde91623a6b6e18a339f9823170312d91e126649e0d0f4ce71d0200
-DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
-DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
-DIST bitcoin-21.2.knots20210629.patches.tar.xz 711680 BLAKE2B da49c6ab075b2478482daeafefcad507f12718e4ed2af847e64aa30ff0839876b9a5b68bc53f2327c9e18df51870d50f7e7d6b2215d5fde1d147567d9d60ffa5 SHA512 e0386f2712053475548c3d7fa927117d1fefa27d447c1398bec152e601a9be0af7a1b03f83f5345b03af252b372091548ce75075f42e4831f4e85f622531962b
 DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
-DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
-DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
-DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoin-tx-0.20.1.ebuild 2425 BLAKE2B bbee2ef80a096b1c0cbf2c1c49002849ed273b2d5d4e3cc1789cfe4510d805757861e0bdd458666098e838274efa3e1d5a3d135a1bc3eb3e6a8f806b43aef8ac SHA512 153ac9766f28887f7e5edf6c7cba62858066a319ed78c1835205f1fc83aa2bde08322f9338c6b0027bae01d98f3d2a95f2155c16cf7f48b5ae1843a7216fb9c5
 EBUILD bitcoin-tx-0.21.0.ebuild 2433 BLAKE2B ae42a797e2f2c258e0f70fa5bdde4250c14e2f9db658a6df208d4449d71bbf5fb9e5dbf3cd2364a5595b5ead60143df3504413910b2ab5a9f423ff85f916b54e SHA512 e985e69f181f72438e32eecd29bc78e70904cea6d61b053e8405c4205d48b0864fc4e0f1df004b021fbee581f7fac50f23f6d832c5d5e7f8c02ac4972a29eb5e
-EBUILD bitcoin-tx-0.21.1.ebuild 2369 BLAKE2B 6c1455f0c53116bcbadd1ca83fc2f860c1800eee6ebe09621734a9b28daa167a2256477585ea462d6c1b4c6eddd51e693e1fe8ab12efa05379f0e6fc3fc3b381 SHA512 9080a729ba701d6ec0935a800aa1fa13f8e05b629135b1ed70eb2b4420d733f4f6ff8db7cdb024222d170626383bbef0a123828e4048b2f0cf54b677dbbe67f2
-EBUILD bitcoin-tx-21.2.ebuild 2338 BLAKE2B 81581820ccec6aa8599ca4234aff79b5233b72159cc28d7d2e02df7cd04bd260a4df93b747093816a3af6e1b52d4d79ce1e1acac8781d769fbef5e11feaee556 SHA512 11537ddd5d5e1a218803e24aae12cfd10658ffbb0c35b9e0237ef1e51f2a6f4991a5e013367acb66812f807d0c0f13ede45588c5fcd1829bb311ad5f5d4561e8
 EBUILD bitcoin-tx-22.0.ebuild 2699 BLAKE2B 5957a6f040f3a07a607ff8b0e25ff8788450ea198ff394a0d593423d75cc13ec3f12bda2ff632cdd3672eb5222d8ae1c9345925e0c2e6e1a11143a400f6cc18b SHA512 4255cfa0064a3e985c90522175b780244f3336ae14f3de3106bb05359583274cdfea9f7912be610ec55ee684b7850b8f96f9ffa72def2c2f7d51327f56d98308
 MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
deleted file mode 100644
index e112dc6a8e41..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
-KNOTS_PV="${PV}.knots20200815"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="knots"
-
-DEPEND="
-	dev-libs/boost:=
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-"
-
-DOCS=(
-	doc/bips.md
-	doc/release-notes.md
-)
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
deleted file mode 100644
index c7ebffda8f7d..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf"
-KNOTS_PV="${PV}.knots20210629"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="knots"
-
-DEPEND="
-	dev-libs/boost:=
-	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
-	>=dev-libs/univalue-1.0.4:=
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	doc/bips.md
-	doc/release-notes.md
-)
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2021/05/01/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
deleted file mode 100644
index ebfc9e5de376..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="af591f2068d0363c92d9756ca39c43db85e5804c"
-KNOTS_PV="${PV}.knots20210629"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="knots"
-
-DEPEND="
-	dev-libs/boost:=
-	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
-	>=dev-libs/univalue-1.0.4:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13
-"
-
-DOCS=(
-	doc/bips.md
-	doc/release-notes.md
-)
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2021/09/29/release-0.${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
-	fi
-
-	eapply_user
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/gitlab-ci-linter/Manifest b/dev-util/gitlab-ci-linter/Manifest
index f0e4f3bcb4f1..a0900aef17e6 100644
--- a/dev-util/gitlab-ci-linter/Manifest
+++ b/dev-util/gitlab-ci-linter/Manifest
@@ -1,5 +1,5 @@
 AUX gitlab-ci-linter-no-strip.patch 508 BLAKE2B e7c41901cdaef662218fb5e1631971ef68831c12b0217cfad424a6d4f3498357d8655cea292c03232bcc1ba91e84f110ca6d711f3a58b9da33ed4f07bede1db7 SHA512 21be7d8a38b335e942a226417a33b578142beed311aa264090022ce168dc7c0f17a5dd17ff26a0449078d995650fa221f5be4114cc570f1e6e1873d5e36c487e
 DIST gitlab-ci-linter-2.2.0-deps.tar.xz 24021948 BLAKE2B 34f31d80477e7d8b54c5ed18cddec8414c5f85edfebe9659768f67cde9fb5db784eaa94c8b33a33612beb66056656dfe6414a515109f719b6448e94887575dc3 SHA512 ecee1ec2188a9c8d6ec1ef4f4302a5278fa146fa059050d5da37fed550025277b86ea748629ab425be03b8382a71decb30998b41d0b10d6c0fc5717b61c18a38
 DIST gitlab-ci-linter-2.2.0.tar.gz 38488 BLAKE2B 78d4083ad10cb43cf2d2f1a57f6e37ca7cb99acc60da751bcfe44d728affb70dfd9dcd62d37def09f7d1b26fcf9f04e8bdd06bcfee7aaa891f387b038c985bed SHA512 3d63b7f73ebf5ba1885f8d56e9d8179f3854b45a6129cbbd2db0e8b3f4b2ee33ab1f3f2403f227aec667108fa56b4b1018cd1cd43c912599ba772dbaa1b0e036
-EBUILD gitlab-ci-linter-2.2.0.ebuild 645 BLAKE2B 6d554ca16c9824113f65639d4f0913c3fac571600a99e5009215c15e96c1b5972eee6cf8d51ef0479e46775a36220a10777b7a984282aa2a44e01ff0e01a30d3 SHA512 c49808adac4654a103051c0a38a2a7c37b19a094aadd7b11a9b1faee34ba3bfdd35bcee4e3eb1ba0de4c842cde2675dcb16d7097178b906d75cbd6e195de9ba3
+EBUILD gitlab-ci-linter-2.2.0.ebuild 661 BLAKE2B fabe81bcb66ec14a9a6ff97537b3616bd772dc8456ee84a4c931706feac906b418270097ebf272bac84cfe97e083dd1132ab98b0dbe0fb39869c7c74c75cd1e9 SHA512 c37b6d581b3217d3b0f6c6b58ae159e8d7ae1cd51d343508ab0a2737091ba2e99a33a65c7684fa6cfd0f3e0b3b4a3ac59c8843192ecdeb5430ab91e68d903ffc
 MISC metadata.xml 258 BLAKE2B 14fff3c5ded754d49480aaad0bf53ddb8cc4d824c072af60647f5bc179aebe8902564c877b9ac0199384d2823b1950a6c48cd2c6297c604e0d2f92c276a9768d SHA512 2d2417fd604c1e3dd12bcb46d06e08b1acdf2117eea460d115f66f0114a6daf2a3dbaae7af7ae74625398d336f5759a6e5456f4f1d0104bcae4e74265f6a0e54
diff --git a/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
index 8b1a44dd64b5..c20365fed0df 100644
--- a/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
+++ b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.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
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
+RESTRICT="test"
 S="${WORKDIR}/${PN}-v${PV}"
 
 PATCHES=(
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
index bc0053f38e55..74e58f16b770 100644
--- a/dev-util/scap-driver/Manifest
+++ b/dev-util/scap-driver/Manifest
@@ -1,4 +1,4 @@
 AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-EBUILD scap-driver-0.29.3.ebuild 1819 BLAKE2B 37e02a10023da73915c48db09bc6203d6e9ce7d76abfa1b57fc5ee25f7130c95d11d94f3cd951cbc5e484c6f8ba91b32a7c9d6b9994c21fdf88ee92783564a33 SHA512 58eb46539115e7ab9a69618fb55678c4f8aca5b0bdd0d8beb613da29e7c506a168781b8d9d8a4ca37fae164b2787bf088eaada40d3eb59a8f490c50a4b5e101d
+EBUILD scap-driver-0.29.3.ebuild 1818 BLAKE2B 739c7da7402f536aa4ee483c77de16498fef6460bdaad84f35bb7bb6f4ad06daac2e99349498f68f741c8348120ccb535bdaa7333d17ce10f3feea78d4889ddf SHA512 7c7d39dc69f2cdc28e656911513ca560722399b051adb5ef6a5626503536337ab7eeae39a2b9ababd217188324e4f270cc3ff9105ca04c63f3f9a919ebf26931
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/scap-driver-0.29.3.ebuild b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
index 53e97a4e1765..b7f0615e4841 100644
--- a/dev-util/scap-driver/scap-driver-0.29.3.ebuild
+++ b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/libs-${LIBS_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="!<dev-util/sysdig-${PV}[modules]"
 
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index e10abfece99a..9e4c9d10be53 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,4 @@
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
-EBUILD sysdig-0.29.3.ebuild 2036 BLAKE2B 2e627eb9d5224dd46437f81088cc4dbe9b2f508c971a068d99392e71cede611f8114bb4f77c61a3ed29885cbb75c2ec5ef31ca23515aa27b3704437c35059a98 SHA512 91370d43f8e83da898c948704f09555ad6c75763e76d70fa37c8ef3a4b7a74dec626df1a759e2a8f6babe2b025959fbce2e2ccc257ce59379fbdd05998910af7
+EBUILD sysdig-0.29.3.ebuild 2035 BLAKE2B 21e6b40e15261ba7d428b127343942c68973bae8617c26c83eb4a2e7350e364869894a76628132db04e96c4c636e07de4e36d73f2f5c0680c70f2298dcdb537c SHA512 82e848ac5fd1048b6cd7f342cb14a9eef45247c1ac022039f93564f68a2efb28ee72324aec3f1f2e7f1fa969e1f22c69ab736fd6053b4f5299504a2da78a87bf
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-util/sysdig/sysdig-0.29.3.ebuild b/dev-util/sysdig/sysdig-0.29.3.ebuild
index 6cb3d07ab2bc..83dacb21b23f 100644
--- a/dev-util/sysdig/sysdig-0.29.3.ebuild
+++ b/dev-util/sysdig/sysdig-0.29.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+modules"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index f9992ee0cd36..8d85e9d38f15 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -7,6 +7,6 @@ DIST trace-cmd-v3.1.5.tar.gz 328689 BLAKE2B ae77b418505c545ef2b701c484cec944b6d8
 EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61
 EBUILD trace-cmd-3.0.2.ebuild 3028 BLAKE2B dca25da4895984203d401b75e79328cfc4e80408f62792ae63c17ef5c41a388f725af9d1054f23f83c20a0cce754b3638eaa02de6b5599f2c7c7be44f9ad189b SHA512 089bc4e6ecd966bf37217bc1bdbe06f883cb9f3116e3b69591a229baec093c9638e3305ff7efac4e2a58cf22fdc44885f7cabeee8760c370ac57cf49ce9903c5
 EBUILD trace-cmd-3.1.2.ebuild 3028 BLAKE2B 2d9f8226f5423bd93bc3af018108bcad3dc19f87b25aa17a30eea44221602a2f57372e020ac7254e08f9f00d9a4d4bff0248ac745ff5aba56fd1d614254269f9 SHA512 d9578451a54a19e52f2a2716543366b69da83c90ccf426f6e01f50b98b90306aef0774d9e239a1405e63fc1157236fb5805e03f72ed20c4d55a23b5a64628cbf
-EBUILD trace-cmd-3.1.4.ebuild 3081 BLAKE2B 5240fbef847d2c86a45a992f320fb99d321812600aa3f354c673e2d61bcd1cc5174c94e4e9e4d593d27c8e3f92230be6d8cae7872c515322d881950c814918b4 SHA512 143bcb1330bb5e6e3527323b9f5b90148d027f5fdb40a6d4be9355498b7d497393c1585e139bb634ce49a8b4c339a06ada4d7a204043a1c4ad72749c29c3e7e7
-EBUILD trace-cmd-3.1.5.ebuild 3095 BLAKE2B 56cbe9bd96904ecc7598145a92aa9e2ff7ea70212d72c1023f2cabc179a7637ba0538a4205112cd51fe08a8865145231b83b1b17a768ab01b14bd105f6d0ee1c SHA512 65b366cd7e36b60c35fd2c9c7e173127d33ae5e5b19bf6726148135bfa0c06b83c5123ddcf44a86014849b2ede79a01ae9d626ffa23f5dbaa7a4accb2e3dcc84
+EBUILD trace-cmd-3.1.4.ebuild 3303 BLAKE2B 45686dbfcc5fe62c2d22d6154362d1c10d1f162a7208fec7004892b7dbf5ada5617653dbcbf6c9a7c4583fc491fec064e273ccd5631a24e436d03cacc7773154 SHA512 7e2b2e20ca186d814bb7c539bf45b0d3f7c37ca9ff7d72b8ccac060d9bb6ad5815427a843bce7265a935557387e921bfa56e2282c3b38023a7f35e71934ea5b9
+EBUILD trace-cmd-3.1.5.ebuild 3317 BLAKE2B c0b524b324dc5c14349a28f43fe61465ded1caddbf9a46905dbae4cd258d9b2e23881f92f7b4cc56354a9b642d9e699bb97a25f759e5cc572609cba2293bfbcd SHA512 814e02289dfa8d4e88b845f6d8297a1aaafe848e5b3508dc77a2bdc0cad874cc63cf04cccfe48bf03a496a915150b9b25c332e3ac333939f8dc9d535f9a42952
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
index f13210697f74..308eb115628e 100644
--- a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.1.4.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
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	python? ( dev-lang/swig )
-	doc? ( app-text/asciidoc )
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
 "
 
 # having trouble getting tests to compile
@@ -65,7 +68,13 @@ pkg_setup() {
 src_prepare() {
 	default
 	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-e '/^prefix/s:/usr/local:/usr:g' \
 		-i Makefile || die "sed failed"
+
+	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
+		-e "s|^pdfdir.*|&-${PVR}|g" \
+		Documentation/libtracecmd/Makefile \
+		Documentation/trace-cmd/Makefile || die
 }
 
 src_configure() {
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild
index b608032b58bf..63c0354925ab 100644
--- a/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.1.5.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
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	python? ( dev-lang/swig )
-	doc? ( app-text/asciidoc )
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
 "
 
 # having trouble getting tests to compile
@@ -65,7 +68,13 @@ pkg_setup() {
 src_prepare() {
 	default
 	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-e '/^prefix/s:/usr/local:/usr:g' \
 		-i Makefile || die "sed failed"
+
+	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
+		-e "s|^pdfdir.*|&-${PVR}|g" \
+		Documentation/libtracecmd/Makefile \
+		Documentation/trace-cmd/Makefile || die
 }
 
 src_configure() {