From 8396419620672dd773aa2d9d46619cbac631dfbd Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 21 Apr 2017 12:10:19 -0500 Subject: app-emulation/containerd: fix snapshot base versions I spoke with Manuel, and all of these snapshots are based on 0.2.5 not 0.2.3. This will clear the way for stabilization without forcing a downgrade. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- app-emulation/containerd/Manifest | 6 ++-- .../containerd/containerd-0.2.3_p20170308.ebuild | 40 ---------------------- .../containerd/containerd-0.2.3_p20170315.ebuild | 40 ---------------------- .../containerd/containerd-0.2.3_p20170329.ebuild | 40 ---------------------- .../containerd/containerd-0.2.5_p20170308.ebuild | 40 ++++++++++++++++++++++ .../containerd/containerd-0.2.5_p20170315.ebuild | 40 ++++++++++++++++++++++ .../containerd/containerd-0.2.5_p20170329.ebuild | 40 ++++++++++++++++++++++ 7 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 app-emulation/containerd/containerd-0.2.3_p20170308.ebuild delete mode 100644 app-emulation/containerd/containerd-0.2.3_p20170315.ebuild delete mode 100644 app-emulation/containerd/containerd-0.2.3_p20170329.ebuild create mode 100644 app-emulation/containerd/containerd-0.2.5_p20170308.ebuild create mode 100644 app-emulation/containerd/containerd-0.2.5_p20170315.ebuild create mode 100644 app-emulation/containerd/containerd-0.2.5_p20170329.ebuild (limited to 'app-emulation') diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index bb82748eb049..c524e4fe21fc 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,4 +1,4 @@ -DIST containerd-0.2.3_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d -DIST containerd-0.2.3_p20170315.tar.gz 1036056 SHA256 8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826 SHA512 96f8a6a5053018fc7889583481c1e24d5cfd8cb780bd76d7c09d299cac836f0842927aa6c5ff7ae8b3cded99b596fce64c7db18f9de6dc527eacc2202baa01dd WHIRLPOOL feac3f3f1f078b46a4ef794e287fee78a34a59b159295f9f5779733e93c6b315cedde658538644d33a41057392c34a44b7de08942c77a03c456c1aef24862fa7 -DIST containerd-0.2.3_p20170329.tar.gz 1036065 SHA256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 SHA512 b7d56adaac26c9f0fd0900467fb5f8500472b602d7ce2373704c08ae6a0b852051e469a4fa51c8db475499872a51fcdd65c2adc4124102e66b8ca86cc5b2ff2f WHIRLPOOL 98567c28df37dbe3ad9f926fdae35e5ceb2df50c90373e58b14b1b5204d6eb9763050acf90abd40b44791510809ba3390f91b61a77265db078a221055557a301 DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4 +DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d +DIST containerd-0.2.5_p20170315.tar.gz 1036056 SHA256 8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826 SHA512 96f8a6a5053018fc7889583481c1e24d5cfd8cb780bd76d7c09d299cac836f0842927aa6c5ff7ae8b3cded99b596fce64c7db18f9de6dc527eacc2202baa01dd WHIRLPOOL feac3f3f1f078b46a4ef794e287fee78a34a59b159295f9f5779733e93c6b315cedde658538644d33a41057392c34a44b7de08942c77a03c456c1aef24862fa7 +DIST containerd-0.2.5_p20170329.tar.gz 1036065 SHA256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 SHA512 b7d56adaac26c9f0fd0900467fb5f8500472b602d7ce2373704c08ae6a0b852051e469a4fa51c8db475499872a51fcdd65c2adc4124102e66b8ca86cc5b2ff2f WHIRLPOOL 98567c28df37dbe3ad9f926fdae35e5ceb2df50c90373e58b14b1b5204d6eb9763050acf90abd40b44791510809ba3390f91b61a77265db078a221055557a301 diff --git a/app-emulation/containerd/containerd-0.2.3_p20170308.ebuild b/app-emulation/containerd/containerd-0.2.3_p20170308.ebuild deleted file mode 100644 index cb0991a7e6ba..000000000000 --- a/app-emulation/containerd/containerd-0.2.3_p20170308.ebuild +++ /dev/null @@ -1,40 +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/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="595e75c212d19a81d2b808a518fe1afc1391dad5" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -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/${EGO_PN} - -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 -} diff --git a/app-emulation/containerd/containerd-0.2.3_p20170315.ebuild b/app-emulation/containerd/containerd-0.2.3_p20170315.ebuild deleted file mode 100644 index 1690d6849bdf..000000000000 --- a/app-emulation/containerd/containerd-0.2.3_p20170315.ebuild +++ /dev/null @@ -1,40 +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/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="422e31ce907fd9c3833a38d7b8fdd023e5a76e73" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -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/${EGO_PN} - -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 -} diff --git a/app-emulation/containerd/containerd-0.2.3_p20170329.ebuild b/app-emulation/containerd/containerd-0.2.3_p20170329.ebuild deleted file mode 100644 index 4e989b9f24a9..000000000000 --- a/app-emulation/containerd/containerd-0.2.3_p20170329.ebuild +++ /dev/null @@ -1,40 +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/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="9048e5e50717ea4497b757314bad98ea3763c145" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -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/${EGO_PN} - -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 -} diff --git a/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild b/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild new file mode 100644 index 000000000000..cb0991a7e6ba --- /dev/null +++ b/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN="github.com/docker/${PN}" + +inherit toolchain-funcs + +if [[ ${PV} == *9999 ]]; then + inherit golang-vcs +else + MY_PV="${PV/_/-}" + EGIT_COMMIT="595e75c212d19a81d2b808a518fe1afc1391dad5" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc64" + inherit golang-vcs-snapshot +fi + +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/${EGO_PN} + +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 +} diff --git a/app-emulation/containerd/containerd-0.2.5_p20170315.ebuild b/app-emulation/containerd/containerd-0.2.5_p20170315.ebuild new file mode 100644 index 000000000000..1690d6849bdf --- /dev/null +++ b/app-emulation/containerd/containerd-0.2.5_p20170315.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN="github.com/docker/${PN}" + +inherit toolchain-funcs + +if [[ ${PV} == *9999 ]]; then + inherit golang-vcs +else + MY_PV="${PV/_/-}" + EGIT_COMMIT="422e31ce907fd9c3833a38d7b8fdd023e5a76e73" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc64" + inherit golang-vcs-snapshot +fi + +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/${EGO_PN} + +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 +} diff --git a/app-emulation/containerd/containerd-0.2.5_p20170329.ebuild b/app-emulation/containerd/containerd-0.2.5_p20170329.ebuild new file mode 100644 index 000000000000..4e989b9f24a9 --- /dev/null +++ b/app-emulation/containerd/containerd-0.2.5_p20170329.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN="github.com/docker/${PN}" + +inherit toolchain-funcs + +if [[ ${PV} == *9999 ]]; then + inherit golang-vcs +else + MY_PV="${PV/_/-}" + EGIT_COMMIT="9048e5e50717ea4497b757314bad98ea3763c145" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc64" + inherit golang-vcs-snapshot +fi + +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/${EGO_PN} + +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 +} -- cgit v1.2.3-65-gdbad