diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 299364d0fd..3cad773a9d 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 a7d7e64cdf..0000000000 --- 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" -} diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild index d50270645b..86b90c98b1 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" 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 2010055927..535e4e2d91 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}" diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest index 19b70505d5..f11ead0a94 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 b0f33d7708..0000000000 --- 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="!