From c9bf58d918004d0a7a773706c2aaadf0271559fd Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Tue, 20 Feb 2018 16:22:53 -0500
Subject: [PATCH] app-emulation/containerd: Fix the 1.0.* manifest entries

The entries were defined for the release archives as Gentoo's
mirrors were serving, but the SRC_URIs were pointing at commit
archives.  This syncs our SRC_URI definition to match Gentoo's so
that the same sources are used and the Manifest verification works.
There is no difference in what gets built.
---
 .../app-emulation/containerd/containerd-1.0.0.ebuild        | 6 ++++--
 .../app-emulation/containerd/containerd-9999.ebuild         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild
index dfdce460f7..8218c6777a 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild
@@ -11,11 +11,13 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://${GITHUB_URI}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="89623f28b87a6004d4b785663257362d1658a729" # v1.0.0
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="89623f2"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot
-	MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v${PV}"
+	MAKE_VERSION_ARGS="REVISION=${CONTAINERD_COMMIT} VERSION=v${PV}"
 fi
 
 inherit coreos-go systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
index 7c3c93dce4..fe0f27ad45 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild
@@ -11,7 +11,9 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://${GITHUB_URI}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="9b55aab90508bd389d7654c4baf173a981477d55" # v1.0.1
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="9b55aab"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot
@@ -41,7 +43,7 @@ src_prepare() {
 	default
 	if [[ ${PV} != *9999* ]]; then
 		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo ${EGIT_COMMIT})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
 			-e "s/-s -w//" \
 			Makefile || die
 	fi