commit:     08561219d3263a52bc263a73334003cd8f06eabe
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 05:34:56 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 05:34:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08561219

app-containers/containerd: revert BDEPEND on <go-1.18

This reverts commit c9020e90c4c56acada3022341bb372805759562f.
This forced downgrades on users.
The fix should have been to bump containerd.

Bug: https://bugs.gentoo.org/835367
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/containerd/containerd-1.4.11.ebuild | 4 +---
 app-containers/containerd/containerd-1.4.12.ebuild | 2 --
 app-containers/containerd/containerd-1.5.9.ebuild  | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app-containers/containerd/containerd-1.4.11.ebuild 
b/app-containers/containerd/containerd-1.4.11.ebuild
index 30fae7be30c6..44e419c33326 100644
--- a/app-containers/containerd/containerd-1.4.11.ebuild
+++ b/app-containers/containerd/containerd-1.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,9 +27,7 @@ RDEPEND="
        ~app-containers/runc-1.0.2
 "
 
-# bug #835367 for Go < 1.18 dep
 BDEPEND="
-       <dev-lang/go-1.18
        dev-go/go-md2man
        virtual/pkgconfig
        test? ( ${RDEPEND} )

diff --git a/app-containers/containerd/containerd-1.4.12.ebuild 
b/app-containers/containerd/containerd-1.4.12.ebuild
index 8a980b0b8089..6f2f10d5cd92 100644
--- a/app-containers/containerd/containerd-1.4.12.ebuild
+++ b/app-containers/containerd/containerd-1.4.12.ebuild
@@ -27,9 +27,7 @@ RDEPEND="
        ~app-containers/runc-1.0.2
 "
 
-# bug #835367 for Go < 1.18 dep
 BDEPEND="
-       <dev-lang/go-1.18
        dev-go/go-md2man
        virtual/pkgconfig
        test? ( ${RDEPEND} )

diff --git a/app-containers/containerd/containerd-1.5.9.ebuild 
b/app-containers/containerd/containerd-1.5.9.ebuild
index c89b6ed9daa5..8c3ca72bdc9c 100644
--- a/app-containers/containerd/containerd-1.5.9.ebuild
+++ b/app-containers/containerd/containerd-1.5.9.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
        ~app-containers/runc-1.0.3
 "
 
-# bug #835367 for Go < 1.18 dep
 BDEPEND="
-       <dev-lang/go-1.18
        dev-go/go-md2man
        virtual/pkgconfig
 "

Reply via email to