From e9e8a926d35a1f62b8b61c55ab2f13b0e1e4651e Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 4 Jul 2024 12:16:09 +0200
Subject: [PATCH] app-containers/containers-image: Sync with Gentoo

It's from Gentoo commit 4e921990bd654009619549b60d3b6eb4ccf26800.
---
 .../app-containers/containers-image/Manifest  |  1 +
 .../containers-image-5.29.2-r1.ebuild         | 39 +++++++++++++++++++
 .../containers-image-5.30.0.ebuild            |  1 +
 .../containers-image-9999.ebuild              | 38 ++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-9999.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
index 9bde6f4631..1382b88588 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
@@ -1 +1,2 @@
+DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
 DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
new file mode 100644
index 0000000000..5a0b9d3756
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Default config and docs related to Containers' images"
+HOMEPAGE="https://github.com/containers/image"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/image.git"
+else
+	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="amd64 arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
+PATCHES=(
+	"${FILESDIR}"/moving-policy-json-default-yaml.patch
+	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
+)
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild
index 9cc63590ec..de66edc716 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
 # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
 PATCHES=(
 	"${FILESDIR}"/fix-warnings.patch
 )
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-9999.ebuild
new file mode 100644
index 0000000000..9d755c4cf4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Default config and docs related to Containers' images"
+HOMEPAGE="https://github.com/containers/image"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/image.git"
+else
+	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
+PATCHES=(
+	"${FILESDIR}"/fix-warnings.patch
+)
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}