From 628f031414a2f96eaeb63d4a77f8e36d0d856697 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 1 Sep 2025 07:07:01 +0000
Subject: [PATCH] app-portage/portage-utils: Sync with Gentoo

It's from Gentoo commit 782526463a71e95b6e9ddfc617c3e3368adaea66.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
---
 .../app-portage/portage-utils/metadata.xml    |  2 ++
 .../portage-utils/portage-utils-9999.ebuild   | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml
index 110ffa562e..628d617954 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Fabian Groffen</name>
 	</maintainer>
 	<use>
+		<flag name="gpkg">Build GLEP-78 gpkg support in qpkg</flag>
+		<flag name="gtree">Build gtree repository cache support</flag>
 		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
 		<flag name="qtegrity">Build qtegrity applet, this adds additional dependencies for OpenSSL</flag>
 	</use>
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild
index 83f2812f88..24afae4e7a 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -18,9 +18,21 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="openmp +qmanifest static"
+IUSE="+gpkg +gtree openmp +qmanifest static"
 
 RDEPEND="
+	gpkg? (
+		!static? (
+			app-crypt/gpgme:=
+			app-arch/libarchive:=
+		)
+	)
+	gtree? (
+		!static? (
+			app-crypt/gpgme:=
+			app-arch/libarchive:=[zstd]
+		)
+	)
 	openmp? ( || (
 		sys-devel/gcc:*[openmp]
 		llvm-runtimes/openmp
@@ -33,6 +45,18 @@ RDEPEND="
 		)
 	)"
 DEPEND="${RDEPEND}
+	gpkg? (
+		static? (
+			app-crypt/gpgme[static-libs]
+			app-arch/libarchive[static-libs]
+		)
+	)
+	gtree? (
+		static? (
+			app-crypt/gpgme[static-libs]
+			app-arch/libarchive[static-libs,zstd]
+		)
+	)
 	qmanifest? (
 		static? (
 			app-crypt/gpgme[static-libs]
@@ -65,6 +89,8 @@ src_configure() {
 	econf \
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
+		$(use_enable gpkg) \
+		$(use_enable gtree) \
 		$(use_enable qmanifest) \
 		$(use_enable openmp)
 }