| 1 |
commit: 08561219d3263a52bc263a73334003cd8f06eabe |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 28 05:34:56 2022 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 05:34:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08561219 |
| 7 |
|
| 8 |
app-containers/containerd: revert BDEPEND on <go-1.18 |
| 9 |
|
| 10 |
This reverts commit c9020e90c4c56acada3022341bb372805759562f. |
| 11 |
This forced downgrades on users. |
| 12 |
The fix should have been to bump containerd. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/835367 |
| 15 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 16 |
|
| 17 |
app-containers/containerd/containerd-1.4.11.ebuild | 4 +--- |
| 18 |
app-containers/containerd/containerd-1.4.12.ebuild | 2 -- |
| 19 |
app-containers/containerd/containerd-1.5.9.ebuild | 2 -- |
| 20 |
3 files changed, 1 insertion(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-containers/containerd/containerd-1.4.11.ebuild b/app-containers/containerd/containerd-1.4.11.ebuild |
| 23 |
index 30fae7be30c6..44e419c33326 100644 |
| 24 |
--- a/app-containers/containerd/containerd-1.4.11.ebuild |
| 25 |
+++ b/app-containers/containerd/containerd-1.4.11.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2022 Gentoo Authors |
| 28 |
+# Copyright 1999-2021 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -27,9 +27,7 @@ RDEPEND=" |
| 33 |
~app-containers/runc-1.0.2 |
| 34 |
" |
| 35 |
|
| 36 |
-# bug #835367 for Go < 1.18 dep |
| 37 |
BDEPEND=" |
| 38 |
- <dev-lang/go-1.18 |
| 39 |
dev-go/go-md2man |
| 40 |
virtual/pkgconfig |
| 41 |
test? ( ${RDEPEND} ) |
| 42 |
|
| 43 |
diff --git a/app-containers/containerd/containerd-1.4.12.ebuild b/app-containers/containerd/containerd-1.4.12.ebuild |
| 44 |
index 8a980b0b8089..6f2f10d5cd92 100644 |
| 45 |
--- a/app-containers/containerd/containerd-1.4.12.ebuild |
| 46 |
+++ b/app-containers/containerd/containerd-1.4.12.ebuild |
| 47 |
@@ -27,9 +27,7 @@ RDEPEND=" |
| 48 |
~app-containers/runc-1.0.2 |
| 49 |
" |
| 50 |
|
| 51 |
-# bug #835367 for Go < 1.18 dep |
| 52 |
BDEPEND=" |
| 53 |
- <dev-lang/go-1.18 |
| 54 |
dev-go/go-md2man |
| 55 |
virtual/pkgconfig |
| 56 |
test? ( ${RDEPEND} ) |
| 57 |
|
| 58 |
diff --git a/app-containers/containerd/containerd-1.5.9.ebuild b/app-containers/containerd/containerd-1.5.9.ebuild |
| 59 |
index c89b6ed9daa5..8c3ca72bdc9c 100644 |
| 60 |
--- a/app-containers/containerd/containerd-1.5.9.ebuild |
| 61 |
+++ b/app-containers/containerd/containerd-1.5.9.ebuild |
| 62 |
@@ -25,9 +25,7 @@ RDEPEND=" |
| 63 |
~app-containers/runc-1.0.3 |
| 64 |
" |
| 65 |
|
| 66 |
-# bug #835367 for Go < 1.18 dep |
| 67 |
BDEPEND=" |
| 68 |
- <dev-lang/go-1.18 |
| 69 |
dev-go/go-md2man |
| 70 |
virtual/pkgconfig |
| 71 |
" |
Archives