gentoo resync : 07.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
commit: c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree: b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-util
parent: 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)
36 files changed, 712 insertions, 43 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 499ff91502e4..8123cac08b08 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index af4a7f2a9fc2..fa914b080103 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -4,10 +4,13 @@ DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27
 DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
+DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
+DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
 DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 EBUILD android-tools-31.0.0_p1.ebuild 3403 BLAKE2B 494f2436c3c883bdc56c3a7dcca03c8e970f30f9eda1d5097985e547a515b8ede94405a483b8869d6b850163b170ca24f63a7526f8146d509bb0cd01e2120d05 SHA512 9b74696df9597428739015aa67163ba1ede670c3821a331ba540104eeb998b4e93592377a3207df25585ab456be91a049ac9b30ad2e592b1581068dab2e157d7
 EBUILD android-tools-31.0.3.ebuild 2207 BLAKE2B 075ba2bcbf2f30b9c3804be39c3b67397634e69baf1572096f32a3f0d927fd35526246ef2e4590dddf92f71350bc172bf58c1e70107cfbde015588ada9f90509 SHA512 57d1e597562ab7688f5715635b6c4f86e7dd5b8b00fc120793fd7a047924f647f9f4725e86b93afb0648c8c8c086cca5a7eeea56a90a2636d23fcf571daccde7
+EBUILD android-tools-31.0.3_p1.ebuild 2568 BLAKE2B 541230f443d359d9384b9657e7e376b2a56e54e93a7203f498679492a1d70c94f34ac3d1eddac3a85c530e975d20a269543d8b53b35f57dcac6feaff15c7ca0b SHA512 bc5b3c72dea4604d095771dfb36516af86749996b69f6edfd61c6066c283cf95edfb7429f952d1ed73f5bb7720c98d7a712241e9aec10bd88b9d2f7fd466e43e
 MISC metadata.xml 715 BLAKE2B 86f1b747788d730497f2b94265ac665cd5af7d4c203f07d30134fe310c82c6f054e09dce0469f091dad560df58bd6db1ef72dfb8684d413b81429bf57d067106 SHA512 73326b3b0a91b8b39965c7fd7be6aa30d0e5326fdadceba9a2b9f3f20f47e22fe93581fe170c2f1b8f7299d887796a8143505bce1921565056d14a5529fc1354
diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
new file mode 100644
index 000000000000..ba179d04c56f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-disable-werror-boringssl.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index fb672189c749..e2d4aace7085 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -7,4 +7,5 @@ DIST bcc-0.23.0.tar.gz 5254103 BLAKE2B 011559f081dd8f95b45b64e347ed191f585f6f5e3
 EBUILD bcc-0.22.0-r1.ebuild 2502 BLAKE2B 4b48547c387bcf109adf746eb57eb04d93c41c6116b481beb9654dfaf82470ec34f5998cd9da0badbc308d4b0409ee7efcc4b2f1874265e5f12ca22fda4e9fbd SHA512 44f531b55f2a27be716276bf646ae2652b7e55134636c0c229fb1d327332842e8ec7211a8a9a4402e2362e17574e6fcbc375d2e0697c96250f35f5b02f554bee
 EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
 EBUILD bcc-0.23.0-r3.ebuild 2969 BLAKE2B 803465e0955b7e896c1baf05d4eed95879439407b248df17e738a61ec1b863f400166113ab7ff65fab0c58ebcd5667cc8b7683e939ee675578a89a8393a8da3f SHA512 309fc7d9c8e710bc7a2311b513352225a13049bc93abf6fa7b641c3b474c8b298c5275222eebc9aedb54fd70057a165ecf245b9847355814b4c64d33d4e9089b
+EBUILD bcc-0.23.0-r4.ebuild 3069 BLAKE2B 4317e7c2ba6be3721f07296b5dc7f877ef3394f236b056ea39f6e10a9a9705f59f6173401299cfca0b5c2cdc6a321caac1b601572433d7c9b02277b2b7f7bbe2 SHA512 4f6f09c1cab99e29fdc3985e273d719e2455d3c4bd30a1793aec6329683ffb3fe931ca9c98516960b3c48ebb441b2da23edda1cb0649637e24ee3d8f496bbc30
 MISC metadata.xml 501 BLAKE2B b958c89640d4cfe0cd5951fbfe65394b84a606c2ac4e73893b46fb950ce7a53f9a9623636bb8f3926c0637539c1aed3107cbf1e6aa52fc0d8a9b948977fab747 SHA512 32e576ce7431409c9c3a69f3ac1d5f757b6ec9807fa86d38a93db02721b0e10771dea786c646513f952fc6603e64df2eefa5797ef2103c55a9b1be60bee522b9
diff --git a/dev-util/bcc/bcc-0.23.0-r4.ebuild b/dev-util/bcc/bcc-0.23.0-r4.ebuild
new file mode 100644
index 000000000000..4f45cf6e2a90
--- /dev/null
+++ b/dev-util/bcc/bcc-0.23.0-r4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+LLVM_MAX_SLOT=13
+
+inherit cmake eapi8-dosym 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 ~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.5.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.14.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 -a 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[${tool##*/}]} ]] && name=bcc-${tool}
+		dosym8 -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/bpftool/Manifest b/dev-util/bpftool/Manifest
index 738844c6b65b..3308d1674a74 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,7 +1,9 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
+DIST patch-5.15.12.xz 620100 BLAKE2B 8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468 SHA512 0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
 DIST patch-5.15.8.xz 537596 BLAKE2B 0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72 SHA512 ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 EBUILD bpftool-5.14.14.ebuild 2825 BLAKE2B ddddd1db68cd7ebce4872227c8896ef0f81a85b46230c7e4ef83e08cc3a004f46df67815812a2f80d8ec56e65e0bb794b56fc32f8c5ee70ed8d9ed52add95aae SHA512 b67729b68efd059799b8dcc8146bfdb6ea8e92482fcc2f960d7e3bcf7a2002409f1423f13ef2c18b31bacdf86a7c5eee322d563540dfa03752a0ccbb7458c9f9
+EBUILD bpftool-5.15.12.ebuild 2831 BLAKE2B de315e53f165a2008a74021dbf4ccfeab5a59121e1044dd5b11d3df29c086c38ce32a40ab7d1fb2aa16ed7c1cbf4208a7ca1252fef3eb48716cd0b74d6c64684 SHA512 87b2a927a3b3b2738f0a2f126af9d83bbd68b7200c4b36b987e898d65c3508018636413cfb113715065514b7ccf251a0b8903597249ce8ed116c4ae881a3880e
 EBUILD bpftool-5.15.8.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.15.12.ebuild b/dev-util/bpftool/bpftool-5.15.12.ebuild
new file mode 100644
index 000000000000..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.15.12.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
+HOMEPAGE="https://kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	sys-libs/zlib:=
+	virtual/libelf:=
+	caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	${PYTHON_DEPS}
+	dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+	local paths=(
+		tools/bpf kernel/bpf
+		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
+	)
+
+	# 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} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# dev-python/docutils installs rst2man.py, not rst2man
+	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+	local arch=$(tc-arch-kernel)
+	tc-export AR CC LD
+
+	emake V=1 VF=1 \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
+		prefix="${EPREFIX}"/usr \
+		feature-libcap="$(usex caps 1 0)" \
+		"$@"
+}
+
+src_compile() {
+	bpftool_make
+	bpftool_make -C Documentation
+}
+
+src_install() {
+	bpftool_make DESTDIR="${D}" install
+	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
+}
+
+pkg_postinst() {
+	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
+}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index b1b295a6719e..f5b0f3a1e205 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -5,7 +5,9 @@ AUX bpftrace-0.14.0-dont-compress-man.patch 1760 BLAKE2B dc07764635e845729e684b0
 AUX bpftrace-0.14.0-fuzzing.patch 499 BLAKE2B 3dfbc2594676c37c239c92c94b475cbfa9b30ff785bba436e0cf5729deac51c7f10826ddb9603f02bd39645af626e0aa2565b46ac79ede40d936203def321391 SHA512 bf2a3569097274a46e5ed9fe8ea014ae3a0c9f42684e56b948cd6ec458e022d98aaecaac7577150e3a78c81583e678fbfa0f798c342e827ea7af9a4c2b128f0f
 AUX bpftrace-0.14.0-install-libs.patch 8077 BLAKE2B ae165fd4eceae5d159d28b9a0fb29e8c12dd565c127984469ad55675e115f48ae0de471ddb3b88699560472e63f0fd4fef187708d722f5e42e749f0cbe066ae1 SHA512 3664a93d9ab6f824ea2c7689020287a8cc3da45c27a146a3301394e5adbde56a899727d7fd15d912dd7b2ba8e9c84508e4c5b563d551e7315ec05c1f9eddfc7d
 DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B 3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5 SHA512 78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
+DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B 832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1 SHA512 0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
 EBUILD bpftrace-0.14.0-r2.ebuild 1800 BLAKE2B 595833564e6d29016a523502877ab550a65d8749f6afd4a090ee10fb0c06470488c00ea8379b8f84cdce994651e2b323402c7b1663a2113db90b4b1a101c3c5d SHA512 37f6b42c84c82107b51b035d94e7ff704587c6241e05e872ed98cf6ad4a17acab24f66265339dc57e905a82b868acc4182f4a245cecdb52a5871d4db53757574
 EBUILD bpftrace-0.14.0-r3.ebuild 1714 BLAKE2B 920871a51ced4378659f415e3f08ed29a3b2aaee9613977b0efa090d86429c1a464c71fa7a9d5ec73a134f38a9086c9af8519ca88c60c008233796ca3e4af9e6 SHA512 b667cdbb36ffdace520ed8c29c384ea50c71679f1e798f1e5921a59307ef2c3202789bd8fcc988d0c1776ab88feebc869de6d9f60a071721e9a3fc3b56d1dead
 EBUILD bpftrace-0.14.0-r4.ebuild 1897 BLAKE2B 9e895fff1c210b84f2b25ece52f155b80373ad798777ca4737612e4c1c7eb275206baccce366faa68f6ec65ec732d81e7008542b485ede9a303213c3cdede8f4 SHA512 377ed0d43308a1a7d785537bbd4975c64ecb0bf133491d9133c5d76b50ea5f5db7e0f341e0e3142ac0949dd67f40453d6b59c7bfa2028634ef4380b67463355a
+EBUILD bpftrace-0.14.1.ebuild 1897 BLAKE2B 64e23a87fd0c2b7e55d2d909ab1d45b80dc59ec10b1e056799dc016824312874bdea7f52dfcb0a19efb33bb5d78e628fa7a6fffd19a5fc164313d947ef3b49b9 SHA512 2d650c65d67af11dc76f554f56b7ba374b295ccd4c738181f04496866b86ac7c83d3b9a18d92a9d823dd7e5a390547220cde3a0f5e1188cbf9a2f80af5f65d26
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
new file mode 100644
index 000000000000..81645fe66617
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+
+inherit llvm linux-info cmake toolchain-funcs
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libbpf:=
+	>=dev-util/bcc-0.13.0:=
+	dev-util/systemtap
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-apps/sed
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+	"${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_SHARED_LIBS:=OFF
+		-DBUILD_TESTING:BOOL=OFF
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index ff007d72ed0c..6c7768fa2c25 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,7 @@
 DIST byacc-20210808.tgz 891489 BLAKE2B e349e960cdbc654b148ec8412f8502e26976f8a933e3846fc4ff308440c8c8058b3422dbc0a709b792ec727c62f3b4ed7d0679d9d5da69fed8c4e08daa801625 SHA512 cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4
 DIST byacc-20211224.tgz 894135 BLAKE2B 6b9e7686e66d9f23ba92f5d8129bda72f75b71a50a72792ec241270102d972279b775b6dcfba85f79dd3bad04470838c1a9f2a675d620322393c7251afafab25 SHA512 e2b9df443c5b05179815808d61e693e942549ca6484a5ab4fdb285b9468da9ed3a90e00d1950a0fbacd1890e5a69bcc03b6d7135a7bbfa59ab0995125b9a8642
+DIST byacc-20220101.tgz 895100 BLAKE2B a78b3530cae045453a6d19fb0dfe3b84034638c624183a32950a19d9b5dbf6b4e4f32ab943e3bad9e9e497107513763be1f758f7cfdf0ffcf31e23a0e2fa5ad9 SHA512 9aff85f0b4ea7f0c9b2e25a155537c99e0591582b2c76c251f08493987a343a812ff86b9cf3d8ecb0954140817c9b164328117de9116f7013e6ec0d91a27486e
 EBUILD byacc-20210808.ebuild 720 BLAKE2B 7adf13f8402a63d3106b295d3f3b7e0b99c674a3c567c7645600e8b73edb26e40fa0f7f72ab334c67ada51662207da29b95eccee092013e5fa51f3385879b85a SHA512 797b80df70601601ee535f1d723d4515c14b613bef1398973b64f9dc70d47a6e8a796fa2880880fb13f9899fa32b5636fd04f99bf9e4bcf13e3be8b1fcce2818
 EBUILD byacc-20211224.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
+EBUILD byacc-20220101.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
 MISC metadata.xml 356 BLAKE2B 3f7f63e3c9b146f59f1f5af0d683294a58b264e2945fd1a30635c64d462f4615395a49b6acedaeb3ae6377061e85b2496b898db6d8b39a3b8ac8f3cd800a666c SHA512 6f1890fde8b83fe6821ac2e9d298f4dda67bd1a15b26e54d51de685cba60b7f938e4cea3f335635773bb54f4a7fadc9a41e52dadebbb41897c042b4c995ba634
diff --git a/dev-util/byacc/byacc-20220101.ebuild b/dev-util/byacc/byacc-20220101.ebuild
new file mode 100644
index 000000000000..6f72092c3d7c
--- /dev/null
+++ b/dev-util/byacc/byacc-20220101.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
+# Seems to be unreliable (unstable tarballs): bug #820167.
+#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index fe2c9261fcf0..0494586f9c2c 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
-EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
-EBUILD catalyst-3.0.20.ebuild 1995 BLAKE2B b2f0697036bb398041e2b2b131ccf8e76c6253b1766c3b713e8faa4e9fe27666a72557dfa9acc461f4429b0f259388034f5bb7a77cee283b29282e6a144bf56d SHA512 ba313426092a0df20ef95b9a5dfa2ad5d7feefaa69d336c19da95ab19f9f90a2fdb4a3e67fdd61cbc40c76a938ba2feed53bb66d1af436c47b74e779212aea9e
+EBUILD catalyst-3.0.18.ebuild 1921 BLAKE2B e6816716661490d98271f79ae6f78a48394df34f6ba1e3a0ee504d0fbd218861b135ca7b82136c2ebe4ce5b29efc9c0a2527fc5d362342ffc49159588fa65084 SHA512 05ed3e0a88ac4f70a71efa372b9ffb28b4b6fe51299aecbcabb386176ecccfbdc35de12341bc4f93a08e3768d04315824460c4e776a6b1e4e717876c68b62ffe
+EBUILD catalyst-3.0.20.ebuild 1918 BLAKE2B 6ea62e94157d650de3a91e8ab1d2b7d32e85d5289826dd23508a166f6c65aaf13515f2b2901b8ae4ccb6a8287897e9f6072c40b104a320a5a4b0a3557b6bbd57 SHA512 8782d03208dcf3b278e7a377aece147b745b7bb67ce634db807f7c4ce871c85c17a90d7fac35ef0762ea46e69b2136dfe7d695161bf8c59499a398cff5c57cb1
 EBUILD catalyst-9999.ebuild 2274 BLAKE2B 07e21a527e4b5724991af355fb60038e70e4f06977b9b9b0efc009a90aef7a9edfb4b8fb300c51189392b98df876c25f1390915ee12537a7635eab30899437b5 SHA512 d90235cc0e6257121f2734dfe3924294b4a8feff2a77618e1212373e538d8b234b9f7418c0830df579bb2b5f9a512b4cd353f80d5171d494fad8260ef7c2200c
 MISC metadata.xml 513 BLAKE2B 22190e4d7fa9f6ff81681614aad1ae622462418be7fbdb6ecb11bf14f884b6520592a8125a5896ff27de788824a98a0005853ad54ed8fcb39daddec570924551 SHA512 a47a00346b514a42add12c5d0d83d712e1cd28e1737ba4c3a1ebc710ad4a0cab365c969e2da5e78f675a5a5ecdeef8925fae53a80ca8d22df6cf74d89efdf1c4
diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
index 5793fe90faef..3a8a525c1ceb 100644
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
+IUSE="ccache doc +iso system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -36,8 +36,10 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	|| (
+		app-arch/tar[xattr]
+		app-arch/libarchive[xattr]
+	)
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index fc94fc1efeab..8bf7848b4cc1 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
+IUSE="ccache doc +iso system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -36,8 +36,10 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	|| (
+		app-arch/tar[xattr]
+		app-arch/libarchive[xattr]
+	)
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index aabc52407ca5..fa5c58d8c7b8 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,7 @@
 DIST gtk-update-icon-cache-3.24.26.tar.bz2 92076 BLAKE2B 650d13d2848adf65fca545f03f599faea763f3380c9e1100d55089e1211808d52267f635bcdcc508dd98a7dd41bfd64c43798db13e3a9869e362cfe03f075dc0 SHA512 20f76853114a014d770756d857a633f41b218d65fd514eed4beaa56f629c392a7581de82a8ef5bffae2cdc7ae00fbdf44ded761f29de34a5912b37101da85538
 DIST gtk-update-icon-cache-3.24.30.tar.bz2 92369 BLAKE2B 89ec0003d527e8dea55c0afd9253f716c6f6b18a52815e861ea4764cc01ca40ffee6ac3d9112457b6a8d83d07364fd89d29efd3c839cd6c95756300ca919727f SHA512 8c9dab1034e9c2fd2029cc7d28d070db6c660bb1190d7842b60f95e209465a6621e49e1feb87af52a13d68d7a03d94938da36c06e89809bf9f9749bd8ae9b571
+DIST gtk-update-icon-cache-3.24.31.tar.bz2 92491 BLAKE2B 4388e7dfbb89e80bc686d5def74dc363562f944ee29b7355849c42ae391034039e138e1e25f5bfaaade09a6f71a5a94e47f5ad921a51ed6ab0485c0d863045ab SHA512 bc86fe49ce1e6eb3a4657dc536a9106eaeaa1f6682d7f8b61da36a5577add7ada8dd46e81de8274800c9e659ddbc4d4d610d6b691c8e582f35298a7e619c3c0c
 EBUILD gtk-update-icon-cache-3.24.26.ebuild 894 BLAKE2B e826d5017315b1682e6839af48816643f15ed4ae0b3de88b34ebfba09b52f661f22ea76db699703000c6e2fc71927c7ce627a3b2cef0e2c12a0504874bd4373b SHA512 e31664e37b5cad2da0ad2c4261cab6ca980d318860d66391aa2f7fb312069921563c432f0d54748a5786053e0a75e97a14120851a87e54934c6ae6abe60f0d41
 EBUILD gtk-update-icon-cache-3.24.30.ebuild 902 BLAKE2B 7715e8adacc6ceac7cda1f631c9aaf8813ad9d0ed7ecca6576f223dca9ae6bc4d269405492491f8f03167c74927f6d773df852690fef7c98d090a9c95854d350 SHA512 90b8b67859a82d65d9d57becebd7bdd1004c20c1556d0c8e66cbc16463e7df99fa21e9843fa78ee675783c2ffed9dc2eb2adf0d9c975f62ea6d8799ecccaf3d7
+EBUILD gtk-update-icon-cache-3.24.31.ebuild 902 BLAKE2B 0b1a9bea9129fb2e828a1e42fcb55c3b76094fb2e7a29080688e8dcd757985d229f683a77b8320b718972be6d9ac241c797ba217c606eb3ff093f5cc15c3e48a SHA512 83da1a1ebc34a55fba1e226e5b6f223e5d02384ba0657a0494872ec7a1820e5413127f11d57e4bb759c0e6904f5fb09b96fa455bf24c1b7286692f1849b91774
 MISC metadata.xml 648 BLAKE2B ed19ff8bfaf0f16a46301b34de6f3b85031a04b094122ce28fe518ecea76d5b6bd94e81b374d4524b8eb9f102a252052c9e3a3504012095ce086536f067499dd SHA512 cd479d9f1b3316132d563e2d4f2d8353226b41b1020c76d020627ccb04af1dcee61abcc4fdd9307542e0abe91eca3eec6ce76b69ac4c802a71673a94bcf5dfd8
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild
new file mode 100644
index 000000000000..8d19a6d22df5
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
+SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+	!<x11-libs/gtk+-3.22.2:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index f2f44955dcdd..5ccc4b5f9a94 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,5 +1,5 @@
 DIST include-what-you-use-0.16.tar.gz 742573 BLAKE2B b8cd90db490d13f140126df8955d0968a9248480da09ca29b82fe1178c779ca75e6f29239bc6fb1556200c7d7c498f2340839e8500455ecaed9e6199fd3d55f7 SHA512 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
 DIST include-what-you-use-0.17.tar.gz 747385 BLAKE2B 0f584521b070eec6448d65d6dc4c4fe09110e85099d2696da82be800ee82522185f378c849559d899424a85864878d5b7b4790b900c438ef1f008262d6de6e28 SHA512 2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290
 EBUILD include-what-you-use-0.16.ebuild 1172 BLAKE2B 60808543d4b660f87bd498de00f3e80a71921c5e3ed0726bf3a7d0588be7240d66d2456d4f03f2b143ff20ae67e7d743262beaf17dc6efdd77e46936e9d01585 SHA512 118f9e92561d531c13ba576e1f27ec929fa6432c416be34a6fba6585b23ad5e0e812c134b9d8d90273a33b83b03266995dd5d6eb8be14bc75d4269ffaa2be548
-EBUILD include-what-you-use-0.17.ebuild 1173 BLAKE2B ad05a0d0e28fe780df5813a45200bca4c3a9b3ca70a4a3dfeb94c4cc5854aac3c5c3037fb84f19d9c22d07429c2ff58425e3caab195499d76281632c324addc1 SHA512 37d6e97256e0713a08177fab3e7d586a5ac79fe790f51488d1213e81af14647b36f70f4d4c5ca0dab309a12af6e3ef606747dc34e48da96d56f6e35742e1aefc
+EBUILD include-what-you-use-0.17.ebuild 1172 BLAKE2B 758c323e44dd94287cf1c124e8a9bc79826bce4de8c342b3d93ecc4ec1294e198904f55dfed08111268ff6836b37f47af3c9d32cb557f6174a6700b2ba9d9731 SHA512 44864473c3040630c1892e62e77ce064d48e1cc3abdf7eea78bab7337f1e87082cb102865dda4b230f74331725a62a1f680c39563f3121b0b93eda364bdfad1d
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
index ab4c265670d8..16eb95770f77 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LLVM_MAX_SLOT=13
 
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 553bbf3a9533..8c6d4d167fa1 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-php-21.12.0.tar.xz 1080196 BLAKE2B f2eb3ac186b6fcd173542ed92209f947335743c1e526a7d404cba5c9343a11e5607844b3a4f648cafef33f8e771a02ebbe48c69247b6180bee6263e98cc5b9ea SHA512 ccbd2691e4560f76808ff88cf4f2cd35a8574a5fcf99a89ac806f1450ffc173efe552559982f5141be6daf7db2e7f2018c353b31bab4661f0f6185966b67016c
+DIST kdev-php-21.12.1.tar.xz 1080100 BLAKE2B 4cd32d1b90931814b916ab7b7d2e452341f8f6b1fa839eb240ef28e765cbfba620b277d184b550462c0d517530c1315553cb4130cf027d75239088c4c7bfb8a3 SHA512 16d698d54185d9d479b47d880e95504d894b991bf6cfea73130ff0ddde2475121900574a2270f229f5d2f399de19c61211a1b2323c183551885b707c17f17094
 DIST kdev-php-5.6.2.tar.xz 1063520 BLAKE2B b301f2da6c0936dd08f6a8ee72599e0c247c5efe18190e3c8fc7690a291d86f40f7fdffef7d036b8e5f258f749464c8aedd549feb0249d2d4fbbdefa41254307 SHA512 781ef76536b263c80be1de138b44cb3f979a1c941a868119069fa7265560d3078b9ea45be6cec30b481392a5ac69be100fe8ec3d106fffdbacf4c777045193fc
-EBUILD kdevelop-php-21.12.0.ebuild 1236 BLAKE2B 3b04ab6c80a9bf7c12e79e1ac2654ebf0162a1090ae679b130e81e6439e049b350d87dee2d34948dde686b5d26a67ad75b90c51a5867688751b8d196e3f91fd2 SHA512 af6b8841cc51cc34aa738c04b97fa0749330505b909d4071e8c78555bba7eabcfa08cbf469ffd62bc842bd1fd2bc7dd20a1e3c31f36002a7a069efc8b722e33e
+EBUILD kdevelop-php-21.12.1.ebuild 1236 BLAKE2B 0ac2acd6548a251f3cd2d1dab7c5e80cb337a36163a222b4a0cbb9d22d6481af912c6bf5a0f1ff055343e2cd6640fb158d03e73583bb8d2d3e806fec0f21dd9a SHA512 ceaa2b3dc4eaf3fa4241c484397ad978945d8648d9e78d7395d73a3c29ec73ebef882e4fec5a0270b33150f9c699eac3731d38a9af2bcd7184763141cd8cb82a
 EBUILD kdevelop-php-5.6.2.ebuild 1268 BLAKE2B 3ea3809a2518fb945014417a737b27c3801b5b0f6167fd8dc70245a4ea2458df0ec4bb3b12e127ab8ec5aeb9e3e1f071a87c8231526ea51f1e56bcace9a9859a SHA512 20882dba1e6305ceca52b8f949e5bcf9e57e16d4cbc30a89227753c639ed14a1474f2f90baae9c90a5a00edb77cbe1a5f722ff15259da2eb6f3d17c0c18135ad
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-21.12.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-21.12.1.ebuild
index 0460e8d8bd87..9b46c241133e 100644
--- a/dev-util/kdevelop-php/kdevelop-php-21.12.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-21.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 6c9b12dec8bb..bcadff0897a7 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-python-21.12.0.tar.xz 1090020 BLAKE2B d77ae39723b80f3b6c21ab7dfc235c6e758936ab3cb56fa0fcc49ba24b5c3d6cae5a082cee3f41e821a9f4242a1629eea7347f25dfb3f0228c4fae15a7149dab SHA512 84464499a7bda50293499701f6035b1384692338582c09dc449c35971ef60826ec61b3eae6b7da235f0423a6efe3d71c3e12f6fde11f4952d64809adfe9e7d59
+DIST kdev-python-21.12.1.tar.xz 1089964 BLAKE2B 29e62029eff2d951f3a815e8829891c957c46984b4181fdbfff02c1f049063d2906159f54c6da7bf2044794e941386dad2eed9795a1284a81cbe36b5ee73aba5 SHA512 f3ac384959c455a9d220f03f983a52aab862cc1539949f1921610f6028fc7ea53bb97d69fabd0c4a950ff0a906af904a05bfe350693554d00f26cdd8d1e586e9
 DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
-EBUILD kdevelop-python-21.12.0.ebuild 1240 BLAKE2B e83487e1b6f4fae386563a5cd2b36b240e455c70e0a8766103802d135e167ef39966e927155b3566877ab619b65c98392b264c8ad402dd811ce3c50f01bb10fe SHA512 bcd9b013eef38e944473409b8a639771eb0ccb0d05995aae3cfe36e5069e590f7f71be9c21985aa90caf2f4f3be4331890cbb7095f75f27c886af25140bd68a3
+EBUILD kdevelop-python-21.12.1.ebuild 1240 BLAKE2B 2ac14f37a0dc62f962f14ba735351f9bfe34d5e12c6dca1fb84d49b9dab479a114f4a7f602e17bacd437ede728dbb5441ee035d91b17d38a8a241a8d9d8196de SHA512 1a8732aa507b11f261f4910c58a45df34b1d07900d314692d8a0cc5fa0e16e2ea00b2476ce45c438c992e58d33febc0d96f632ef0e0776c716e33241ac33d130
 EBUILD kdevelop-python-5.6.2.ebuild 1272 BLAKE2B 519e46354d3cc4a9b0d8ba013bf9616b0e3f8000c47fb1c60d5150981a787e7a835e104d0f86727e60dae83f061a4ce5b42d54dc4528aeb274873ad355af6292 SHA512 574179828cbc402ba196767bf1a16dc99496f44aa00b8c2edda51ce7b996a72ec4e9bafdb22e3b99949ea8ced80bf22a895b83e29bf0144b22c405736d98bc23
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-21.12.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-21.12.1.ebuild
index 896f5be788f3..15d000b664d2 100644
--- a/dev-util/kdevelop-python/kdevelop-python-21.12.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-21.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 94d5d327f745..069f76905a72 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
-DIST kdevelop-21.12.0.tar.xz 8387568 BLAKE2B 2965964949d242fe5b48d6f357cb455cfa0eca898dd894332a4020ef02ecb8612e51d9bbb545dce862058a889576ba63be84272eda0831585a01751c8439bc6c SHA512 57cd1de0998fe4d81b473f8028ff64fa6c06f6c02d7d751b7caeb91ab07c4e243c8e02966099481a9d9b3ba1207ddadf2993759a56ea9a16dd76f26005c1faab
+DIST kdevelop-21.12.1.tar.xz 8395924 BLAKE2B 22fadff4bbfa67b7e637f3a6d5e00a392eeef8370af9dd4b9edc4eff960f4c5ece2124e88775c4015faf4064d504e8949ee180208d0fdd12142a7458f84d687c SHA512 a2017a1ce8ab1165627783be4798c97a273b873ddc6a475252ec3ad2f27ee43f2b9a1322dd6958a399ea9a7a0117765c1cd7ea57075453fb69df57880fd948a2
 DIST kdevelop-5.6.2.tar.xz 7128828 BLAKE2B 605b16f1666201f49e119499007a2031c4a2b28e7eb5c3b7bbf8bcd8aa2dc069708740831dc9fe327a8c9baebeffeeda5dd6d16c24c21a2be66c7475bf194423 SHA512 d5ec09b3eda439436bee4dee88612deedf02caf949e74cb7d8405fbb40ae6f16ae1b5278da0574f41c43d186edbeec6b8c40918ef7f5fafa437e07a8c4ae92ce
-EBUILD kdevelop-21.12.0.ebuild 4148 BLAKE2B e0ee27b7a6b3d34180cd4e41bd44c5f4d630738d82de67c6cf745af99d75c91b0b35e9e8aa990e8bc25115e53ef0829cddfea9e84552f77514395c4b6035bb45 SHA512 336d09e4dcffebd01a5c51263259cfee75facddd4cbf5352f293eaea31f81f268f80546ae57bce660a0a9e1b714a13c6dfb7b0e28ce16315fe787bdd0ea47374
+EBUILD kdevelop-21.12.1.ebuild 4148 BLAKE2B 16482a57f31769af638f55c8897399eee7e5f925398d7d1446adb0b86d61c23178b1575cb36c05c31f8bcf272cbe6416b5cbd0e6d23d3f46f2fda547f3d09778 SHA512 2272dc2e0dfc925e9412b9a26dabdd4515cfadad65f3576c2bf9d730009d9b21de7425ff62a2623560ab0d4109bb71135e9e42bceba6dc2367e2e5558bc9cb23
 EBUILD kdevelop-5.6.2.ebuild 4178 BLAKE2B 5c84a13004dd3f7b630626292ca843415d14521c475eb5b021b50fae0552b8e99390aa311d2647f03bb2e4eae668007ecf5e07a5484d55072490586101ff32bf SHA512 6392d3caec99dcf6b98fff6dd2c316bcf969f11c4c1a03863959ba344a9267283962feb7c4c60443803e942af854d1a86fa46f8098a77411be536ab6d30fb33d
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-21.12.0.ebuild b/dev-util/kdevelop/kdevelop-21.12.1.ebuild
index 2653f5d9cfd0..8f5b037b29b0 100644
--- a/dev-util/kdevelop/kdevelop-21.12.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-21.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
index b2f840a6401f..88afd20eb3f1 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
 DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 995 BLAKE2B f7829e3549ea052ead9f7cd9f88b4dfdc570486eea499e56727dbb94956d59fbd99fc2784e4fa9abcb79a958016798f81795004b14a268743d5098645e4b38f5 SHA512 5883bf5561b8ac40dbc40bbf7f38c6fec298f0388e0d6abe96f1b40b177f7b883a61b6f1429bc4fc45dcc56c9b8b52951aa358eecc2fc988a7b7354012776a24
-EBUILD patchbin-99999999.ebuild 997 BLAKE2B 564d7d299fb5e76661fb30098bc3fad45e544c4a3839dbcd7a4c5938fa38dd46cae64c12fde6a3e61c0288a4a355d81820cacb24dfe94a655539b30186c6f85f SHA512 8048960d5ae5b23451b280df49e605fb7b1ba8d2d7c39edafb49188c56c2ab9540b4de65ce6bd406e6145dcfa40fb2ebf8e60cc0cbc50d26407a5460cc8e7739
+EBUILD patchbin-20160208.ebuild 962 BLAKE2B bdcaa52af4ac329e25d0ab2f2b12a54b659ccaa1984221661e384a02654891a48f925e317649de7aa8f6cd28bcb02d593fc9a46da4cfba4363da899f5d1a24d7 SHA512 5f43f7b6b7cf5f3d512ba8a1d1fcc68714a1cff1c339ad307b3bce277addf051f02b0e49fa0d5ff2b6eaec4848ebef079e5a0be9b1a113558b697e30038d8b6f
+EBUILD patchbin-99999999.ebuild 964 BLAKE2B de5dcd0d66bf7688088dddf12ede4c3d9c8b7b193a4ccc1aafab65be7b193aa4d5430b5c51b8c62530198dfae8a9544001910075813b98d993cbfef5d11b86e3 SHA512 32293afd7cde3e8d26d6b12c2bcf193cec76de93bb72d1dd4fc086720cc046b1a87a812e9bc41ac8549447ad8c2951322c3c5dd3d6d2800f8f0a1f4761838ba3
 MISC metadata.xml 447 BLAKE2B ddec2854bc29f437acb1c8f7675eb9ca23356ed58fe82ba61b31d5e8e5a4aa5e5aff2d03aad4c4caad89d059be2dc7860fa39c3fa141c74ff5df725172909e6b SHA512 8fdf93f0282057ec7105827d95d12c13cb3b5050a7e7a95d39fb58ff3eb851888ebc0ef5654ec95a3fe9d8e5392542a685172aa60e76f7e0e2b707f05dae516f
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
index 4986103bdca5..b28b64c40823 100644
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ b/dev-util/patchbin/patchbin-20160208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/wine-compholio/wine-staging"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="userland_BSD userland_GNU"
 
 RDEPEND="
 	app-shells/bash
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
index e624022cb841..90587e649d76 100644
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ b/dev-util/patchbin/patchbin-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/wine-compholio/wine-staging"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="userland_BSD userland_GNU"
 
 RDEPEND="
 	app-shells/bash
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index a4eef471fa82..c2e6721bb574 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,12 @@
+AUX radare2-5.5.0-vector35.patch 785 BLAKE2B 7e53aa1258290682827a1ab22a1bfeec12222c7e7c7acdde40a0845f47729918c41de9c59bcc1e79cbd1d318944245994c348e6d76f56852803ffda27206216f SHA512 3d5d7c682482973a00d78736c3d92d29711e729d01a220da5b89f66f27fae2c71cf40173d9ca9616709d4a2cc55a0450ae003e3d97998e0dfff5dcb64eba7675
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
 DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9abbe1f9ca2c7caef98a85b38a5b5e37a31063be289c55fda041e10b8403895f863dd602091ab5307213605260d SHA512 34c96c7c863fb8a59f1d03539375d5b8f31f6021dc84ce943daa163d8a0227bf3156963cc187c366790abec4381da6aa987248e76570a498cfcdeb982cb2ffc0
+DIST radare2-5.5.4-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
+DIST radare2-5.5.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.5.4.tar.gz 9610424 BLAKE2B 4e113d854a55597270663f9c18f1d71da21fa8e539a997773f30178e93de54d397f56103813ec2c60cfabdf2d811151ad7285fc479e1ee681687831030e18da2 SHA512 b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da
+DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 EBUILD radare2-5.3.1.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
+EBUILD radare2-5.5.4.ebuild 2760 BLAKE2B 3726d1b139af09977ffeec4380c77e7d4124c0a2c999f6e5b774030d996d78136a54dd46b791591cd5b613b78f7dbdc430032c80ee7ca98ebe1fded566df4105 SHA512 b2ed6d4db225ce28b2610492563ed84dd5814c8d6de731fc27c7cccab9ec0600afe6edd7660aae14e781f3cdf4aacf582f2ce117e7acf018514a4e6af4f7e36d
 EBUILD radare2-9999.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
 MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
new file mode 100644
index 000000000000..5ebf58020d4d
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
@@ -0,0 +1,22 @@
+--- a/libr/asm/arch/arm/v35arm64/Makefile
++++ b/libr/asm/arch/arm/v35arm64/Makefile
+@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ 
+ ## ARM64
+ arch-arm64:
+-	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64 
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 
+ ## ARMV7
+ arch-armv7:
+-	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7 
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/radare2-5.5.4.ebuild b/dev-util/radare2/radare2-5.5.4.ebuild
new file mode 100644
index 000000000000..3a2f15599169
--- /dev/null
+++ b/dev-util/radare2/radare2-5.5.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+ARM64_COMMIT=3c5eaba46dab72ecb7d5f5b865a13fdeee95b464
+ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
+BINS_COMMIT=a6d1a0331605b4a5db9aa9260386c850d484dc70
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-5.5.0-vector35.patch" )
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+
+	if use test; then
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
+
+src_test() {
+	emake -C test -k unit_tests || die
+}
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 33a0570a4e1a..32ae4498cb4c 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,8 +1,9 @@
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
 AUX rizin-0.3.1-CVE-2021-43814.patch 3292 BLAKE2B 4d9e9f43296dc906839fee4b97794141157dea5e3af7b0f96f5c35369b44f2d04a1f4363366d0e495112d29b658927953b3c19a1375c7ad2377bb3504be3e9ef SHA512 0bcfe32bab666d99fa68e825f4d7406024d2d1f76abc7b3fdbd7803be3f3c27205bbe7d91a671e2679094bedc944a59980a798e07adf20e6bf6d2c46e884b297
+AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
 DIST rizin-src-v0.3.1.tar.xz 64089580 BLAKE2B 04f7e3cfa20a787f47af90c78405f295b346cc0c7d81164ff01bc6a69df526f3f9112ab4cb62092297ae2dda1fa738a2e7feff35e0f1b7f3e7467a8c6e4d1a1e SHA512 743f8f2c9ddb045f39147de9ad971d47f1a26bfcc233f41c12c64ade5e31c992104cf3f93c44c5035142b554779e895224b68f839cd87a59aaf344b4ec88d5fe
 DIST rizin-src-v0.3.2.tar.xz 64170200 BLAKE2B fe11317e4acc1a803323f42fd4c2c6435a2fe4032581ed509f37f7221ec53e0afac04ebe8cb9da693ac283b61c0a70e135007d635c4c5010519a5c7e7cfa19cf SHA512 c472770ee1b156d42a98d4641f365e2255f16489b2223b117c8b88dcac0d72065d1fd7eedad70046188231889e492bafb7b8462987c68311143f14808eaab1cc
 DIST rizin-testbins-d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc.tar.gz 126773703 BLAKE2B f5eaeb7e99e9091b6ca043dd50d03143950adc06b75b5834886d96d6280207c0bea73101a5f9e06c38ba60c0d4cff82dbf1f00364f7d87fe183c0687b06d1904 SHA512 0a017954017c8d57133d51b441411a50aa9ed062c0cc61e1561951fdf0703f5244230cda377885199e9e35dca6780d8582a445ac92286b63ef2ac784777ec0c4
 EBUILD rizin-0.3.1-r2.ebuild 2910 BLAKE2B 3b1817a02c425f703168c5b5c78c7df0106f64df1d2420f59f2d4b66581b1439d18f9e22cb9db3ef08b4580f6e37ace6797113a0a461e5ef7c657b527193c5bb SHA512 4540a23f9a6ca9586a45fb8fbac22762886e54bba5d3863d098bf40a291c09fb5a49f24107352f7a9230749de0aafaec002c91ff3ba6d8b2cd38c281cbcd9b85
-EBUILD rizin-0.3.2.ebuild 2891 BLAKE2B 0ba40b7d0c85e43f0f89cfa84fa4a854f280016ce5420607c21bbb65edc911888732116757a85975e4007d7ba4a57abb21e724af5c1d8c5d51b197b934182d5b SHA512 9145be05965cb1b8daa6d31b11349bd2ffef97e40745ad01dd154e9b46e40fc273cfbc23bcd9d8df702af6b671ad2062f8ea54d0c66e9ead78a156e5aced5d52
+EBUILD rizin-0.3.2.ebuild 2945 BLAKE2B a8887f8f05d71b972076e46f8a41d7d7b2122e699d26dfaeaff720722ae80afcd8d4eb8c6b2b3a2b60232bfc17960f52028f91bf088b6fd3233feaadb8ebfe95 SHA512 a80e5d328a25a464f1ad6c96be3930422c663ab164d00bbb489305932b35619e1d35f6dc6bd8aa32ea2fcf8b7e9b875a3535b51023181cc09a81a744c402dcdd
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
new file mode 100644
index 000000000000..0f5586c0023d
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
@@ -0,0 +1,36 @@
+commit 9bcfa2a6d3eaa5df00ae728c44811faf08effbd3
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Thu Jan 6 11:12:58 2022 -0600
+
+    shlr/rizin-shell-parser/src: Never rebuild parser.c
+    
+    This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
+    of which would be heavy new dependencies. However, these are only
+    needed to rebuild the already-existing tree-sitter parser, which
+    doesn't do much for us (if anything) since it already exists. In this
+    case, it's better to just reduce fragility by unconditionally
+    disabling this.
+    
+    Bug: https://bugs.gentoo.org/830068
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/shlr/rizin-shell-parser/src/meson.build b/shlr/rizin-shell-parser/src/meson.build
+index 0171183ae0..81dcc13b33 100644
+--- a/shlr/rizin-shell-parser/src/meson.build
++++ b/shlr/rizin-shell-parser/src/meson.build
+@@ -1,14 +1,4 @@
+-tree_sitter_bin = find_program('tree-sitter', required: false)
+-node_bin = find_program('node', required: false)
+-if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal'
+-  parser_c = custom_target('parser_src_c',
+-    command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
+-    input: [grammar_js],
+-    output: 'parser.c',
+-  )
+-else
+-  parser_c = files('parser.c')
+-endif
++parser_c = files('parser.c')
+ 
+ shell_parser_files = [files('scanner.c'), parser_c]
+ shell_parser_inc = [platform_inc, include_directories('tree_sitter')]
diff --git a/dev-util/rizin/rizin-0.3.2.ebuild b/dev-util/rizin/rizin-0.3.2.ebuild
index be6e33690c5a..f0f118bdd3dc 100644
--- a/dev-util/rizin/rizin-0.3.2.ebuild
+++ b/dev-util/rizin/rizin-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,7 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
+	"${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 596d4042d1e2..303578bdeb02 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-2.2-musl.patch 9594 BLAKE2B bd05ee635f1213d202428260d5026e34bce319666f64ddd199efa981ab13e5d1eaff67eabeb435a9479970b27de52e77fed2ce2377b03675d629f4a6dcf40cb8 SHA512 0ad7dd21a9821567d9ea2a52582b54c1697c842b08eeb8f627410d24fc2e812e04e642a7355ba9a907720cecbdbc0d973e711f315b0e185a8f1046c448d067b1
-DIST rt-tests-2.2.tar.xz 115120 BLAKE2B 46db78d32b2d5830859757c21e42d4e21cb0da8b2ebcbf8ba738c8e3832a6ea597d686ee6c9cad23f269853ad188219f46a0e5326124f056b4822619076268ac SHA512 826dc8894dd8670e705566b5224f54bdee89e5b48f21ca00e6c4061f28c4fbe2dab14c1e1b1302fec7011dbf28f3eb88c1b8adc137fed7d17958ea972e3c08b1
-EBUILD rt-tests-2.2.ebuild 921 BLAKE2B 0dc4ba32df8d2b74077ba45e240a612eae58edf55d79b4ef17a2cd29c2c15a189c47cff27327d486da2250b71d1de00a4285b62d360c9d010138eb2ed7f931fe SHA512 bf4e3e11a31fdf28612b99d68b4fcf30dd77146fa7e2375c9ed780706a293fb28c9908b511bfb79213db336365224dbb2154f0802a92d603ac9463bf78a229af
+AUX rt-tests-2.3-musl.patch 9602 BLAKE2B 04b537cba7f1de60fa64683b313381304c5ca5b69c451097cf08c84c7dd18321e5b5bfa13a76ae5515bf194c808c017d92232a857725a197049a40b4e9ef7799 SHA512 9367dd015e9a6ee3ba054d89d28d4130fce94b26074434f781553bf5769069e12283d585a10e4777a6eeec39b829a4edcb7d9da7dede00c280eb643c7b3fec31
+DIST rt-tests-2.3.tar.xz 115000 BLAKE2B d5f6a31a31340873348b5ffa6c706deb080e9686944a759fa4e4d53f2041d3f27aa1e9512d7413438bce7c61e05e2495c96eeef0b976ee09377f89d847225aef SHA512 3bf6fe95c5ac9911fb51fba1d4a8e6ad3b96a6cdce464372917673862801353cbbb377c76d3a19325f0b5402f65daf5c605e496d7460949615069366a00a978a
+EBUILD rt-tests-2.3.ebuild 921 BLAKE2B 0dc4ba32df8d2b74077ba45e240a612eae58edf55d79b4ef17a2cd29c2c15a189c47cff27327d486da2250b71d1de00a4285b62d360c9d010138eb2ed7f931fe SHA512 bf4e3e11a31fdf28612b99d68b4fcf30dd77146fa7e2375c9ed780706a293fb28c9908b511bfb79213db336365224dbb2154f0802a92d603ac9463bf78a229af
 MISC metadata.xml 749 BLAKE2B b0072755603e59495f6a9cb82885dd8c882e394c90be750293026948b3f66010c6cd0ab77af16d41a552a1117dbb92886f3afa44b9c9b0b9a6bc7793ab6e7700 SHA512 edcbee69b86ff91ea64a1e60bf7a4329805eaf48337370dba6c3f737c2e459e3c7fa6b6365261a0cb8f5604f5b22d1a7b08f0b8cbba0f0fb44e9623865eff522
diff --git a/dev-util/rt-tests/files/rt-tests-2.2-musl.patch b/dev-util/rt-tests/files/rt-tests-2.3-musl.patch
index caa8d415aad5..6732521a07a6 100644
--- a/dev-util/rt-tests/files/rt-tests-2.2-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-2.3-musl.patch
@@ -77,14 +77,14 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  #include "rt_numa.h"
  
  #include "rt-utils.h"
-@@ -502,12 +503,8 @@ static void *timerthread(void *param)
+@@ -504,12 +505,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
 -	struct sigevent sigev;
  	sigset_t sigset;
 -	timer_t timer;
- 	struct timespec now, next, interval, stop;
+ 	struct timespec now, next, interval, stop = { 0 };
 -	struct itimerval itimer;
 -	struct itimerspec tspec;
  	struct thread_stat *stat = par->stats;
@@ -105,7 +105,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -600,20 +589,6 @@ static void *timerthread(void *param)
+@@ -599,20 +588,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -126,7 +126,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  
  	stat->threadstarted++;
  
-@@ -621,16 +596,10 @@ static void *timerthread(void *param)
+@@ -620,16 +595,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -144,7 +144,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+@@ -750,11 +719,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -156,7 +156,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -780,17 +744,6 @@ out:
+@@ -779,17 +743,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -174,7 +174,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1174,7 +1127,8 @@ static void process_options(int argc, ch
+@@ -1183,7 +1136,8 @@ static void process_options(int argc, ch
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -184,7 +184,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1207,13 +1161,6 @@ static void process_options(int argc, ch
+@@ -1216,13 +1170,6 @@ static void process_options(int argc, ch
  		}
  	}
  
@@ -198,7 +198,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
  		numa = numa_initialize();
-@@ -1943,7 +1890,6 @@ int main(int argc, char **argv)
+@@ -1952,7 +1899,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -206,7 +206,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -1993,16 +1939,18 @@ int main(int argc, char **argv)
+@@ -2002,16 +1948,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
diff --git a/dev-util/rt-tests/rt-tests-2.2.ebuild b/dev-util/rt-tests/rt-tests-2.3.ebuild
index 247753110450..247753110450 100644
--- a/dev-util/rt-tests/rt-tests-2.2.ebuild
+++ b/dev-util/rt-tests/rt-tests-2.3.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
commit	c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree	b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-util
parent	3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)