Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/
Date: Thu, 28 Mar 2019 16:15:13
Message-Id: 1553789694.5592b637b7b2af3f7ce6f32378315367a6bb7882.mrueg@gentoo
1 commit: 5592b637b7b2af3f7ce6f32378315367a6bb7882
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 28 16:14:54 2019 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 28 16:14:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5592b637
7
8 app-emulation/containerd: Remove old
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>
12
13 app-emulation/containerd/Manifest | 3 --
14 app-emulation/containerd/containerd-1.2.2.ebuild | 56 ------------------------
15 app-emulation/containerd/containerd-1.2.3.ebuild | 56 ------------------------
16 app-emulation/containerd/containerd-1.2.4.ebuild | 56 ------------------------
17 4 files changed, 171 deletions(-)
18
19 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
20 index 9eeb839fc7a..6e66991040c 100644
21 --- a/app-emulation/containerd/Manifest
22 +++ b/app-emulation/containerd/Manifest
23 @@ -1,6 +1,3 @@
24 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
25 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
26 -DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
27 -DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
28 -DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43 SHA512 8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
29 DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0 SHA512 b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25
30
31 diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild b/app-emulation/containerd/containerd-1.2.2.ebuild
32 deleted file mode 100644
33 index 0cdf19490c8..00000000000
34 --- a/app-emulation/containerd/containerd-1.2.2.ebuild
35 +++ /dev/null
36 @@ -1,56 +0,0 @@
37 -# Copyright 1999-2019 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -EGO_PN="github.com/containerd/${PN}"
42 -
43 -inherit toolchain-funcs
44 -
45 -if [[ ${PV} == *9999 ]]; then
46 - inherit golang-vcs
47 -else
48 - MY_PV="${PV/_rc/-rc.}"
49 - EGIT_COMMIT="v${MY_PV}"
50 - CONTAINERD_COMMIT="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
51 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
52 - KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
53 - inherit golang-vcs-snapshot
54 -fi
55 -
56 -DESCRIPTION="A daemon to control runC"
57 -HOMEPAGE="https://containerd.tools"
58 -
59 -LICENSE="Apache-2.0"
60 -SLOT="0"
61 -IUSE="apparmor +btrfs +cri hardened +seccomp"
62 -
63 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
64 - seccomp? ( sys-libs/libseccomp )"
65 -RDEPEND=">=app-emulation/runc-1.0.0_rc5
66 - seccomp? ( sys-libs/libseccomp )"
67 -
68 -S=${WORKDIR}/${P}/src/${EGO_PN}
69 -
70 -RESTRICT="test"
71 -
72 -src_prepare() {
73 - default
74 - if [[ ${PV} != *9999* ]]; then
75 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
76 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
77 - -e "s/-s -w//" \
78 - Makefile || die
79 - fi
80 -}
81 -
82 -src_compile() {
83 - local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
84 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
85 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
86 -}
87 -
88 -src_install() {
89 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
90 - keepdir /var/lib/containerd
91 - dobin bin/containerd{-shim,-stress,} bin/ctr
92 -}
93
94 diff --git a/app-emulation/containerd/containerd-1.2.3.ebuild b/app-emulation/containerd/containerd-1.2.3.ebuild
95 deleted file mode 100644
96 index e548ba8fb08..00000000000
97 --- a/app-emulation/containerd/containerd-1.2.3.ebuild
98 +++ /dev/null
99 @@ -1,56 +0,0 @@
100 -# Copyright 1999-2019 Gentoo Authors
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI=6
104 -EGO_PN="github.com/containerd/${PN}"
105 -
106 -inherit toolchain-funcs
107 -
108 -if [[ ${PV} == *9999 ]]; then
109 - inherit golang-vcs
110 -else
111 - MY_PV="${PV/_rc/-rc.}"
112 - EGIT_COMMIT="v${MY_PV}"
113 - CONTAINERD_COMMIT="7f5f1176dd9fb3cc8d3ce5de91759ed3dc969fa2"
114 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
115 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
116 - inherit golang-vcs-snapshot
117 -fi
118 -
119 -DESCRIPTION="A daemon to control runC"
120 -HOMEPAGE="https://containerd.tools"
121 -
122 -LICENSE="Apache-2.0"
123 -SLOT="0"
124 -IUSE="apparmor +btrfs +cri hardened +seccomp"
125 -
126 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
127 - seccomp? ( sys-libs/libseccomp )"
128 -RDEPEND=">=app-emulation/runc-1.0.0_rc5
129 - seccomp? ( sys-libs/libseccomp )"
130 -
131 -S=${WORKDIR}/${P}/src/${EGO_PN}
132 -
133 -RESTRICT="test"
134 -
135 -src_prepare() {
136 - default
137 - if [[ ${PV} != *9999* ]]; then
138 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
139 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
140 - -e "s/-s -w//" \
141 - Makefile || die
142 - fi
143 -}
144 -
145 -src_compile() {
146 - local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
147 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
148 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
149 -}
150 -
151 -src_install() {
152 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
153 - keepdir /var/lib/containerd
154 - dobin bin/*
155 -}
156
157 diff --git a/app-emulation/containerd/containerd-1.2.4.ebuild b/app-emulation/containerd/containerd-1.2.4.ebuild
158 deleted file mode 100644
159 index d34eeabe099..00000000000
160 --- a/app-emulation/containerd/containerd-1.2.4.ebuild
161 +++ /dev/null
162 @@ -1,56 +0,0 @@
163 -# Copyright 1999-2019 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=6
167 -EGO_PN="github.com/containerd/${PN}"
168 -
169 -inherit toolchain-funcs
170 -
171 -if [[ ${PV} == *9999 ]]; then
172 - inherit golang-vcs
173 -else
174 - MY_PV="${PV/_rc/-rc.}"
175 - EGIT_COMMIT="v${MY_PV}"
176 - CONTAINERD_COMMIT="e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
177 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
178 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
179 - inherit golang-vcs-snapshot
180 -fi
181 -
182 -DESCRIPTION="A daemon to control runC"
183 -HOMEPAGE="https://containerd.tools"
184 -
185 -LICENSE="Apache-2.0"
186 -SLOT="0"
187 -IUSE="apparmor +btrfs +cri hardened +seccomp"
188 -
189 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
190 - seccomp? ( sys-libs/libseccomp )"
191 -RDEPEND=">=app-emulation/runc-1.0.0_rc5
192 - seccomp? ( sys-libs/libseccomp )"
193 -
194 -S=${WORKDIR}/${P}/src/${EGO_PN}
195 -
196 -RESTRICT="test"
197 -
198 -src_prepare() {
199 - default
200 - if [[ ${PV} != *9999* ]]; then
201 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
202 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
203 - -e "s/-s -w//" \
204 - Makefile || die
205 - fi
206 -}
207 -
208 -src_compile() {
209 - local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
210 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
211 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
212 -}
213 -
214 -src_install() {
215 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
216 - keepdir /var/lib/containerd
217 - dobin bin/*
218 -}