From 27e8ef29233830d12008e6c4a1aba397588d02f0 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Mon, 22 Dec 2025 17:38:29 +0000
Subject: [PATCH] coreos-base/update_engine: Migrate versioned ebuild away from
 git eclass

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .../coreos-base/update_engine/Manifest        |  1 +
 .../coreos-base/update_engine/metadata.xml    |  3 ++
 .../update_engine/update_engine-9999.ebuild   | 47 ++++++++++---------
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/Manifest

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/Manifest
new file mode 100644
index 0000000000..9a5754a999
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/Manifest
@@ -0,0 +1 @@
+DIST update_engine-3a44be455f7c6978e99f9e3d4f01401d80301c40.tar.gz 283203 BLAKE2B 628269d3adb431484b31bc8d8634381c12a5da8b9624fe4372e4d4d175c166763743fae3f890470116c2066ca4582bd224eeb4a43750c97b83b1dd204ac1ab41 SHA512 c003f2f8217a85a4e720e84caf30a3b2d73b330f96ebf97f3241e5fb5109d8affff984e86caf7a9bcae74e1613cc0548d13e016571924c463dac9dede05db0d9
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/metadata.xml
index 097975e3ad..a89b45be92 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">flatcar/update_engine</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index 126f5cd4f7..8db54f63a6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -1,28 +1,29 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/update_engine.git"
+EAPI=8
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+TMPFILES_OPTIONAL=1
+inherit autotools flag-o-matic toolchain-funcs systemd tmpfiles
+
+DESCRIPTION="Update daemon for Flatcar Container Linux"
+HOMEPAGE="https://github.com/flatcar/update_engine"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/update_engine.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="3a44be455f7c6978e99f9e3d4f01401d80301c40" # main
+	EGIT_VERSION="3a44be455f7c6978e99f9e3d4f01401d80301c40" # main
+	SRC_URI="https://github.com/flatcar/update_engine/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"
 fi
 
-TMPFILES_OPTIONAL=1
-inherit autotools flag-o-matic toolchain-funcs git-r3 systemd tmpfiles
-
-DESCRIPTION="CoreOS OS Update Engine"
-HOMEPAGE="https://github.com/coreos/update_engine"
-SRC_URI=""
-
 LICENSE="BSD"
 SLOT="0"
-IUSE="cros_host +debug -delta_generator"
+IUSE="cros_host +debug delta_generator"
 
-RDEPEND="!coreos-base/coreos-installer
+RDEPEND="
 	app-arch/bzip2
 	coreos-base/coreos-au-key
 	dev-cpp/gflags
@@ -36,11 +37,16 @@ RDEPEND="!coreos-base/coreos-installer
 	dev-util/bsdiff
 	net-misc/curl
 	>=sys-apps/seismograph-2.2.0
-	sys-fs/e2fsprogs"
-BDEPEND="dev-util/glib-utils"
-DEPEND="dev-cpp/gtest
-	${BDEPEND}
-	${RDEPEND}"
+	sys-fs/e2fsprogs
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
@@ -67,8 +73,7 @@ src_configure() {
 
 	if tc-is-cross-compiler; then
 		# Override glib-genmarshal path
-		local build_pkg_config="$(tc-getBUILD_PROG PKG_CONFIG pkg-config)"
-		myconf+=(GLIB_GENMARSHAL="$("${build_pkg_config}" --variable=glib_genmarshal glib-2.0)")
+		myconf+=(GLIB_GENMARSHAL="$("$(tc-getBUILD_PKG_CONFIG)" --variable=glib_genmarshal glib-2.0)")
 	fi
 
 	econf "${myconf[@]}"