From 8ba14215cd4766d9c45b42d531a7408e23e85f2b Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 4 Feb 2021 08:55:37 +0100 Subject: [PATCH 1/2] dev-lang/go: delete go 1.6 Now that Docker 1.12 is gone, we can delete go 1.6 completely. Note, we do not delete go 1.7, which is still needed by containerd 0.2.6 and docker 17.03. --- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 1 - .../coreos-overlay/dev-lang/go/go-1.6.3-r1.ebuild | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.6.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest index 893fab517e..3756b870b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -1,6 +1,5 @@ DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6 DIST go1.13.15.src.tar.gz 21705183 BLAKE2B eac8c6113dd6cef164cc5368732c2dce26f200e309c728ca71b4c312ace465382b8cc1dd8fb216bdf927211d6cb26c21090a9ac9c9ef2d7ac1b16c85feac0e0c SHA512 35d3e7aaef1b0fc6ab684bb7352da3a23194115331ba7d1543225c35939cafcd437f454519aac38182cb8f222723ed9a297f9da566075b5e4079be26952a21e3 DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb -DIST go1.6.3.src.tar.gz 12617426 BLAKE2B 4d51c4f848d29176282e61396ea8a6ae580e743cc4a21deb3b0fc1f417ed50ff33bec4f3712f4d0c89d33ce1ec34638d5fc1b356ff0b88a6cb290d5aae789d15 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 DIST go1.7.6.src.tar.gz 14173249 BLAKE2B 5202382c293213f02909c52c8057776abf1104bba3443db4956d9ab2aa37cfc0661eafb6f56d539384fd425c86aff4f6a756ecd09688d5be0086d761b2865b77 SHA512 b01846bfb17bf91a9c493c4d6c43bbe7e17270b9e8a229a2be4032b78ef9395f5512917ea9faab74a120c755bbd53bbd816b033caadcbb7679e91702b37f8c7f DIST go1.8.7.src.tar.gz 15359792 BLAKE2B b645964d99c0e04f56bd81db820b6cc07bbea608ec5497469a14e99ba42153bd1b2653b182ec27a76b9327eb386ccd5e901871bce62f2f719f35a96594969cbb SHA512 bbe78ab240ce66f0e7c0ba0d5c8915699db1538087cbcd22fa1566c62cb2e4658f467cbbde107f254e84e5744a1db578fc1a6f1784586937cba3d0942e2e6532 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.6.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.6.3-r1.ebuild deleted file mode 100644 index 9e35e2c821..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.6.3-r1.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2016 CoreOS, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit coreos-go-lang - -KEYWORDS="-* amd64 arm64" From be6631220c2d3341c4e6acee96640824e5d45bc0 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 4 Feb 2021 08:57:07 +0100 Subject: [PATCH 2/2] coreos-base/hard-host-depends: delete go 1.6 from the dependency list Now that `dev-lang/go` 1.6 is gone, we need to also delete it from the SDK dependencies list. --- ...nds-0.0.1-r195.ebuild => hard-host-depends-0.0.1-r196.ebuild} | 0 .../coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - 2 files changed, 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r195.ebuild => hard-host-depends-0.0.1-r196.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r195.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r196.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r195.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r196.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index f96bccb2c4..02884ca17a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -40,7 +40,6 @@ RDEPEND="${RDEPEND} dev-lang/nasm dev-lang/swig dev-lang/yasm - dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.12