commit: 3bcce32317e64e002e9f2816e76576c9287e081b Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Mar 19 17:56:46 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Mar 19 18:01:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcce323
sys-cluster/k3s: patch for go-1.18 Closes: https://bugs.gentoo.org/835601 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-cluster/k3s/k3s-1.23.4_p1.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys-cluster/k3s/k3s-1.23.4_p1.ebuild b/sys-cluster/k3s/k3s-1.23.4_p1.ebuild index 9416158cb176..6475669db7f5 100644 --- a/sys-cluster/k3s/k3s-1.23.4_p1.ebuild +++ b/sys-cluster/k3s/k3s-1.23.4_p1.ebuild @@ -54,6 +54,10 @@ src_prepare() { local CONTAINERD_DIR=build/src/github.com/containerd/containerd mkdir -p "${CONTAINERD_DIR}" || die tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die + if has_version -b ">=dev-lang/go-1.18"; then + # https://bugs.gentoo.org/835601 + sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die + fi local RUNC_DIR=build/src/github.com/opencontainers/runc mkdir -p "${RUNC_DIR}" || die
