commit:     4543f0e69a92d8696950524ec2e64bd5d5a0234b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 15:11:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 15:11:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4543f0e6

app-emulation/containerd: fix 1.4.3 tarball

The commit wasn't updated.

Closes: https://bugs.gentoo.org/764791
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/containerd/Manifest                              |  2 +-
 .../{containerd-1.4.3-r1.ebuild => containerd-1.4.3-r2.ebuild} | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-emulation/containerd/Manifest 
b/app-emulation/containerd/Manifest
index 631361d19d6..d0867a03104 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,3 +1,3 @@
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 
0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3
 SHA512 
7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B 
f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa
 SHA512 
79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
+DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 
41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c
 SHA512 
0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80

diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild 
b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
similarity index 89%
rename from app-emulation/containerd/containerd-1.4.3-r1.ebuild
rename to app-emulation/containerd/containerd-1.4.3-r2.ebuild
index 0cbf0912b44..90dd18565d1 100644
--- a/app-emulation/containerd/containerd-1.4.3-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # update on bump, look for https://github.com/docker\
 # docker-ce/blob/<docker ver OR 
branch>/components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="ea765ab"
+CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b"
 EGO_PN="github.com/containerd/${PN}"
 
 inherit golang-vcs-snapshot toolchain-funcs
 
 DESCRIPTION="A daemon to control runC"
 HOMEPAGE="https://containerd.io/";
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 -> ${P}.tar.gz"
+# NOTE: Drop '.gh' on bump, it's there because of bug #764791
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
 -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -78,7 +79,8 @@ src_install() {
 
        # we already installed manpages, remove markdown source
        # before installing docs directory
-       rm -rf docs/man || die
+       rm -r docs/man || die
+
        local DOCS=( README.md PLUGINS.md docs/. )
        einstalldocs
 }

Reply via email to