diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest
index 795a1994d3..b232c9e09f 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest
@@ -1,3 +1,2 @@
-DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
-DIST dwarves-1.21.tar.xz 910480 BLAKE2B b6dcdaf008a7714838904b0bc1050e6af4617e00e168f45a3f1a5d4611a05c898182f3395b2f10478240e05c22ce82a3a7381a1ea7ab41684e3b05ea6e73620c SHA512 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1
-DIST dwarves-1.22.tar.xz 922016 BLAKE2B 79ba94bcbec6ddc9ebcc6d9e72ed63c8704ca9a97bb3df1910114e89cdd4e7cc75024e4281f15f06be8f5b4656dd957a44d561a16beff1af14d8c7dc32fbd184 SHA512 d45b19505cd59eb2cbb42304ab599661355a4085262cb202757822ec1c05476c851dea85e922f9421efb8a978ab475a6a6545757c6ab080f13ac77c5f7186606
+DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7a549efc2cf530c087dd718c7d01f5bcf8b9208965e066770064b6d8db7a9f6ab9a3f3a4612f6fcc8d146c1e8 SHA512 5255930d6898ce35a41e3e553363964663d2b686d12732ff6140fa1d06fcc3806adf28e24ec35ab0712eec0562c52c3943afe9ecce468b0053b852ffeb04c3dc
+DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild
deleted file mode 100644
index 6e645bb830..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit multilib cmake python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild
similarity index 89%
rename from sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild
index 40eb52fc5c..0787ab642d 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit multilib cmake python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild
similarity index 85%
rename from sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild
index 6e645bb830..8a8a28a9f3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit multilib cmake python-single-r1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild
index 7ce8b9b051..d93d2d7a75 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit multilib cmake python-single-r1 git-r3
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-single-r1 git-r3
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"