From f9474f2825adff43dfbcf66c840cc371db3d4e1a Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:05:47 +0000 Subject: [PATCH 1/8] app-emulation/docker-cli: remove GO_BUILDTAGS setting We now build with go1.16 and the go1.16 tag does not show up anywhere in the cli repo. Signed-off-by: Jeremi Piotrowski --- app-emulation/docker-cli/docker-cli-20.10.8.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild index 20100559276..535e4e2d913 100644 --- a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild +++ b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild @@ -34,7 +34,6 @@ src_prepare() { src_compile() { # Flatcar: override go version go_export - export GO_BUILDTAGS="go1.13" export DISABLE_WARN_OUTSIDE_CONTAINER=1 export GOPATH="${WORKDIR}/${P}" From 9e317416fa9cc5212f404923b9fd796cdd69d667 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:07:48 +0000 Subject: [PATCH 2/8] app-emulation/containerd: switch to building with go1.16 Upstream builds with go1.16 too. Signed-off-by: Jeremi Piotrowski --- app-emulation/containerd/containerd-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild index d50270645b6..86b90c98b10 100644 --- a/app-emulation/containerd/containerd-9999.ebuild +++ b/app-emulation/containerd/containerd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/containerd/containerd" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.16" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" From 45e478c650f1d80978188a4351083333060d0dfb Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:08:12 +0000 Subject: [PATCH 3/8] app-emulation/containerd: remove old versions Signed-off-by: Jeremi Piotrowski --- app-emulation/containerd/Manifest | 3 +- .../containerd/containerd-0.2.6.ebuild | 45 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 app-emulation/containerd/containerd-0.2.6.ebuild diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 299364d0fd8..3cad773a9da 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,2 +1 @@ -DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 -DIST containerd-1.5.5.tar.gz 7711631 BLAKE2B 3777db6e7348500b27e8cff799d977d556d1956c097831c3a532791c629997c1f72b2f55db142b5659a253750422ede23a4179633b54226be1b95d96ac26367b SHA512 8ee5aa1d35e76238fd8707bff6b7eedb7931e6489d49b6907a8e190b076fe6fd95ae5e85ecea1605adb7fcd4f3ae0e926696f1d2f3c0d12b61e6df906929b9eb +DIST containerd-1.5.5.tar.gz 7711631 BLAKE2B 3777db6e7348500b27e8cff799d977d556d1956c097831c3a532791c629997c1f72b2f55db142b5659a253750422ede23a4179633b54226be1b95d96ac26367b SHA512 8ee5aa1d35e76238fd8707bff6b7eedb7931e6489d49b6907a8e190b076fe6fd95ae5e85ecea1605adb7fcd4f3ae0e926696f1d2f3c0d12b61e6df906929b9eb \ No newline at end of file diff --git a/app-emulation/containerd/containerd-0.2.6.ebuild b/app-emulation/containerd/containerd-0.2.6.ebuild deleted file mode 100644 index a7d7e64cdfa..00000000000 --- a/app-emulation/containerd/containerd-0.2.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GITHUB_URI="github.com/docker/containerd" -COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.7" - -EGIT_COMMIT="4ab9917febca54791c5f071a9d1f404867857fcc" # v0.2.6 -SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 arm64" - -inherit coreos-go systemd - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened +seccomp" - -DEPEND="" -RDEPEND="~app-emulation/docker-runc-1.0.0_rc2 - seccomp? ( sys-libs/libseccomp )" - -S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} - -RESTRICT="test" - -src_unpack() { - mkdir -p "${S}" - tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" -} - -src_compile() { - local options=( $(usex seccomp "seccomp" '') ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd* bin/ctr - systemd_dounit "${FILESDIR}/containerd.service" -} From 1984b65547a08a61c91a9fff154fcffed8ab3739 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:10:00 +0000 Subject: [PATCH 4/8] app-emulation/docker-proxy: switch to building with go1.16 Upstream builds go through github.com/docker/docker repo and that builds with go1.16 with module support disabled. Signed-off-by: Jeremi Piotrowski --- app-emulation/docker-proxy/docker-proxy-9999.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/app-emulation/docker-proxy/docker-proxy-9999.ebuild index eca8e4de5c5..68f37da0a56 100644 --- a/app-emulation/docker-proxy/docker-proxy-9999.ebuild +++ b/app-emulation/docker-proxy/docker-proxy-9999.ebuild @@ -5,7 +5,8 @@ EAPI=6 EGO_PN="github.com/docker/libnetwork" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.16" +COREOS_GO_GO111MODULE="off" if [[ ${PV} == *9999 ]]; then KEYWORDS="~amd64 ~arm64" From 14c705d49417f6fc80d985fa8dc95c07c3606469 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:10:22 +0000 Subject: [PATCH 5/8] app-emulation/docker-proxy: remove old versions Signed-off-by: Jeremi Piotrowski --- app-emulation/docker-proxy/Manifest | 5 +-- .../docker-proxy-0.8.0_p20161019.ebuild | 42 ------------------- .../docker-proxy-0.8.0_p20170917.ebuild | 42 ------------------- .../docker-proxy-0.8.0_p20180709.ebuild | 42 ------------------- 4 files changed, 1 insertion(+), 130 deletions(-) delete mode 100644 app-emulation/docker-proxy/docker-proxy-0.8.0_p20161019.ebuild delete mode 100644 app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild delete mode 100644 app-emulation/docker-proxy/docker-proxy-0.8.0_p20180709.ebuild diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest index 19b70505d57..f11ead0a948 100644 --- a/app-emulation/docker-proxy/Manifest +++ b/app-emulation/docker-proxy/Manifest @@ -1,4 +1 @@ -DIST docker-proxy-0.8.0_p20161019.tar.gz 2112423 BLAKE2B 8ce90c6dd0184773c1e2c4e31304e8a67c2c571d1ceb62b2a66c92ce277ba73ea2243e8414fbc769501bf76cb79fe890d3d0c7a0ef00d7e2889e20b6982b555e SHA512 a7b040cdeaf15054d436b184370af0f9b23a5b6d0b2c01530b7ad539040186888bb030309e18a1a02ad252753cf4f08aa5e5ec504480a8ffb7050db76764db5b -DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd -DIST docker-proxy-0.8.0_p20180709.tar.gz 2718698 BLAKE2B 6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4 SHA512 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d -DIST docker-proxy-0.8.0_p20210525.tar.gz 3154432 BLAKE2B 3f273cd4c2dd3c797117bebfe06eb3ae8ce3b3f70d495cb0c77a372d64e23f1d9ad31e8efef64df494cc462e9f4fda9311c99ae7e7218f0fc41b6bf44cf8c08d SHA512 6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047 +DIST docker-proxy-0.8.0_p20210525.tar.gz 3154432 BLAKE2B 3f273cd4c2dd3c797117bebfe06eb3ae8ce3b3f70d495cb0c77a372d64e23f1d9ad31e8efef64df494cc462e9f4fda9311c99ae7e7218f0fc41b6bf44cf8c08d SHA512 6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047 \ No newline at end of file diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161019.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161019.ebuild deleted file mode 100644 index b0f33d7708b..00000000000 --- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161019.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/docker/libnetwork" - -COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.7" - -if [[ ${PV} == *9999 ]]; then - KEYWORDS="~amd64 ~arm64" - inherit golang-vcs -else - EGIT_COMMIT="0f534354b813003a754606689722fe253101bc4e" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" - inherit golang-vcs-snapshot -fi - -inherit coreos-go - -DESCRIPTION="Docker container networking" -HOMEPAGE="https://github.com/docker/libnetwork" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -RDEPEND="! Date: Fri, 20 Aug 2021 09:13:27 +0000 Subject: [PATCH 6/8] app-emulation/docker-runc: switch to building with go1.16 Upstream builds with go1.16. Additionally fixup the VERSION variable specify the current Flatcar Docker version 20.10. Signed-off-by: Jeremi Piotrowski --- app-emulation/docker-runc/docker-runc-1.0.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/docker-runc/docker-runc-1.0.1.ebuild b/app-emulation/docker-runc/docker-runc-1.0.1.ebuild index 071dfb4f363..5b4795f6128 100644 --- a/app-emulation/docker-runc/docker-runc-1.0.1.ebuild +++ b/app-emulation/docker-runc/docker-runc-1.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.16" # the commit of runc that docker uses. # see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4 COMMIT_ID="47e597c3eb2f002299eb9be6c8476194a92e9595" @@ -55,7 +55,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.0.1+dev.docker-19.03 \ + VERSION=1.0.1+dev.docker-20.10 \ COMMIT="${COMMIT_ID}" } From c1d44c3780c5000c038f03aced066f5094c42631 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:14:05 +0000 Subject: [PATCH 7/8] app-emulation/docker-runc: remove old version Signed-off-by: Jeremi Piotrowski --- app-emulation/docker-runc/Manifest | 3 +- .../docker-runc-1.0.0_rc2_p136-r1.ebuild | 71 ------------------- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 app-emulation/docker-runc/docker-runc-1.0.0_rc2_p136-r1.ebuild diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest index 402961379e2..2ef78778026 100644 --- a/app-emulation/docker-runc/Manifest +++ b/app-emulation/docker-runc/Manifest @@ -1,2 +1 @@ -DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 -DIST docker-runc-1.0.1.tar.gz 2374642 BLAKE2B 1346add899bf74ad05c6bf62e8580549b2ba0f7d5963c17537f4317652806c72161ab040690fc656c0e21a4f8edb9723d8590639e455471e0e16b4753f16d4fe SHA512 a37b35e46861c34b311d101a9942782664edab1bd32533a1e3d7d6f8a22f25aa1f021352101633622807e0beceba9227dac4d93ed6ab27d969cc8796efc2b808 +DIST docker-runc-1.0.1.tar.gz 2374642 BLAKE2B 1346add899bf74ad05c6bf62e8580549b2ba0f7d5963c17537f4317652806c72161ab040690fc656c0e21a4f8edb9723d8590639e455471e0e16b4753f16d4fe SHA512 a37b35e46861c34b311d101a9942782664edab1bd32533a1e3d7d6f8a22f25aa1f021352101633622807e0beceba9227dac4d93ed6ab27d969cc8796efc2b808 \ No newline at end of file diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p136-r1.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p136-r1.ebuild deleted file mode 100644 index 1910170a796..00000000000 --- a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p136-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GITHUB_URI="github.com/docker/runc" -COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.7" -# the commit of runc that docker uses. -# see https://github.com/moby/moby/blob/v17.03.2-ce/hack/dockerfile/binaries-commits#L6 -# Note: this commit is only really present in the `docker/runc` repository. -# Update the patch number when this commit is changed (i.e. the _p in the ebuild). -# The patch version is arbitrarily the number of commits since the tag version -# spcified in the ebuild name. For example: -# $ git log --oneline v1.0.0-rc2..${COMMIT_ID} | wc -l -COMMIT_ID="54296cf40ad8143b62dbcaa1d90e520a2136ddfe" - -inherit eutils flag-o-matic coreos-go vcs-snapshot - -SRC_URI="https://${GITHUB_URI}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 arm64" - -DESCRIPTION="runc container cli tools (docker fork)" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor hardened +seccomp selinux" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) -" - -S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} - -RESTRICT="test" - -src_unpack() { - mkdir -p "${S}" - tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" -} - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0_rc2-mount-propagation.patch" - "${FILESDIR}/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch" -) - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usex apparmor 'apparmor') - $(usex seccomp 'seccomp') - $(usex selinux 'selinux') - ) - - # CoreOS: Don't try to install dependencies. - sed -i 's/go build -i /go build /' Makefile - - emake BUILDTAGS="${options[*]}" \ - COMMIT="${COMMIT_ID}" -} - -src_install() { - dobin runc -} From 64835679fc78a287027db9b78d7dd167b1c5efe4 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 20 Aug 2021 09:15:50 +0000 Subject: [PATCH 8/8] dev-lang/go: remove go1.13 and go1.7 ebuilds These are no longer used by anything in the tree, after removing old versions of docker-runc/docker-proxy/containerd. Signed-off-by: Jeremi Piotrowski --- dev-lang/go/Manifest | 4 +--- dev-lang/go/go-1.13.15.ebuild | 8 -------- dev-lang/go/go-1.7.6.ebuild | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 dev-lang/go/go-1.13.15.ebuild delete mode 100644 dev-lang/go/go-1.7.6.ebuild diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index 0473d39e458..5760098cb48 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,6 +1,4 @@ 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.11.src.tar.gz 23029946 BLAKE2B b937a8e350b6a30e71427d8cbc52edb73e11f055c16890c81ba4bf2f6aa90fd223f0af9517021741e791c22b78f840b3485ea8df4853865dceae354f4803c55d SHA512 52a107220f02197f07c0d3afef403c3762428c1f69107fa7123bc6cdf6b47dd4e65f2ab3979ad7d12a265b0c9bd0b66e6e50eb91f7fa994ba22882f117afe289 DIST go1.16.7.src.tar.gz 20922206 BLAKE2B 65e53684f66975313caf4661a7c52b178dde8b32ac40f98fe8164fe035c835e1407ef442d41c7cbf907d5093703e440d0e62c398f8ed541bad074b537f6dd6ff SHA512 1aab6f3dcbae71ebfa29a1d9a46613a3aa48de01cee82b48842d92abbb4ee57db019a4d47a3f12af9553c8e2a982e90114a06ee187f908f7c29245d9786b9186 -DIST go1.7.6.src.tar.gz 14173249 BLAKE2B 5202382c293213f02909c52c8057776abf1104bba3443db4956d9ab2aa37cfc0661eafb6f56d539384fd425c86aff4f6a756ecd09688d5be0086d761b2865b77 SHA512 b01846bfb17bf91a9c493c4d6c43bbe7e17270b9e8a229a2be4032b78ef9395f5512917ea9faab74a120c755bbd53bbd816b033caadcbb7679e91702b37f8c7f -DIST go1.8.7.src.tar.gz 15359792 BLAKE2B b645964d99c0e04f56bd81db820b6cc07bbea608ec5497469a14e99ba42153bd1b2653b182ec27a76b9327eb386ccd5e901871bce62f2f719f35a96594969cbb SHA512 bbe78ab240ce66f0e7c0ba0d5c8915699db1538087cbcd22fa1566c62cb2e4658f467cbbde107f254e84e5744a1db578fc1a6f1784586937cba3d0942e2e6532 +DIST go1.8.7.src.tar.gz 15359792 BLAKE2B b645964d99c0e04f56bd81db820b6cc07bbea608ec5497469a14e99ba42153bd1b2653b182ec27a76b9327eb386ccd5e901871bce62f2f719f35a96594969cbb SHA512 bbe78ab240ce66f0e7c0ba0d5c8915699db1538087cbcd22fa1566c62cb2e4658f467cbbde107f254e84e5744a1db578fc1a6f1784586937cba3d0942e2e6532 \ No newline at end of file diff --git a/dev-lang/go/go-1.13.15.ebuild b/dev-lang/go/go-1.13.15.ebuild deleted file mode 100644 index 6075ddc2a83..00000000000 --- a/dev-lang/go/go-1.13.15.ebuild +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2019 Kinvolk GmbH. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit coreos-go-lang - -KEYWORDS="-* amd64 arm64" diff --git a/dev-lang/go/go-1.7.6.ebuild b/dev-lang/go/go-1.7.6.ebuild deleted file mode 100644 index 9e35e2c821b..00000000000 --- a/dev-lang/go/go-1.7.6.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"