diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest
index 07f841d021..1e9179c1b7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest
@@ -1,2 +1 @@
-DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch
new file mode 100644
index 0000000000..da2a10e0af
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.9.0-build-fixes.patch
@@ -0,0 +1,25 @@
+From f912f6630eada34dcfb1320bb46b02d149c32ad4 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Wed, 28 Jun 2023 16:08:41 -0700
+Subject: [PATCH] [base] Never use gcc directly
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b1fd4aa..342daf7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE))
+ 
+ lib/libft.so: $(LIBFT_OBJECTS)
+ 	@echo "    [LD]" $@
+-	$(V) gcc -shared -o $@ $+ -laio
++	$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $+ -laio
+ 
+ .PHONEY: functional-test unit-test
+ 
+-- 
+2.41.0.255.g8b1d071c50-goog
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
deleted file mode 100644
index 53bf5146d4..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		dev-lang/ruby:2.6
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
-	dodoc README.md TODO.org
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild
similarity index 83%
rename from sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.ebuild
index b00ab93154..072dbecae7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r2.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
@@ -27,19 +27,13 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| (
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-			dev-lang/ruby:2.5
-		)
 		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
 	)
 	dev-libs/boost"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.9.0-build-fixes.patch
 	"${FILESDIR}"/0.9.0-remove-boost_iostreams.patch
 )
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index f9480dfe1f..7b9e914929 100644
--- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,72 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic
+inherit cargo
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
-if [[ ${PV} != *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/jthornber/thin-provisioning-tools.git"
+	inherit git-r3
+else
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-else
-	inherit git-r3
-	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="static test"
-RESTRICT="!test? ( test )"
 
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		|| (
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-			dev-lang/ruby:2.5
-		)
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
+# Rust
+QA_FLAGS_IGNORED="usr/sbin/pdata_tools"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/
-		--bindir="${EPREFIX}"/sbin
-		--with-optimisation=''
-		$(use_enable test testing)
-	)
-	STRIP=true econf "${myeconfargs[@]}"
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		default
+	fi
 }
 
 src_compile() {
-	emake V=
-}
-
-src_test() {
-	emake V= unit-test
+	emake V= STRIP=true
 }
 
 src_install() {
-	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
-	dodoc README.md TODO.org
+	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" STRIP=true install
 }