Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/
Date: Mon, 14 Jun 2021 00:31:53
Message-Id: 1623630361.000d1279ef9ffa0bc7bcaa50d09b745dbacf59d4.gyakovlev@gentoo
1 commit: 000d1279ef9ffa0bc7bcaa50d09b745dbacf59d4
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 00:26:01 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 00:26:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000d1279
7
8 app-emulation/containerd: drop 1.3.7, 1.3.9, 1.4.4
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 app-emulation/containerd/Manifest | 3 -
13 app-emulation/containerd/containerd-1.3.7.ebuild | 85 ------------------------
14 app-emulation/containerd/containerd-1.3.9.ebuild | 85 ------------------------
15 app-emulation/containerd/containerd-1.4.4.ebuild | 83 -----------------------
16 4 files changed, 256 deletions(-)
17
18 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
19 index eaa22f899da..8185d4679f3 100644
20 --- a/app-emulation/containerd/Manifest
21 +++ b/app-emulation/containerd/Manifest
22 @@ -1,6 +1,3 @@
23 -DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
24 -DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
25 -DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
26 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
27 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
28 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
29
30 diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
31 deleted file mode 100644
32 index b78f87e7f3d..00000000000
33 --- a/app-emulation/containerd/containerd-1.3.7.ebuild
34 +++ /dev/null
35 @@ -1,85 +0,0 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -# update on bump, look for https://github.com/docker\
42 -# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
43 -CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
44 -EGO_PN="github.com/containerd/${PN}"
45 -
46 -inherit golang-vcs-snapshot toolchain-funcs
47 -
48 -DESCRIPTION="A daemon to control runC"
49 -HOMEPAGE="https://containerd.io/"
50 -SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
51 -
52 -LICENSE="Apache-2.0"
53 -SLOT="0"
54 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
55 -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
56 -
57 -DEPEND="
58 - btrfs? ( sys-fs/btrfs-progs )
59 - seccomp? ( sys-libs/libseccomp )
60 -"
61 -
62 -RDEPEND="
63 - ${DEPEND}
64 - ~app-emulation/runc-1.0.0_rc10
65 -"
66 -
67 -BDEPEND="
68 - dev-go/go-md2man
69 - virtual/pkgconfig
70 - test? ( "${RDEPEND}" )
71 -"
72 -
73 -# tests require root or docker
74 -# upstream does not recommend stripping binary
75 -RESTRICT+=" strip test"
76 -
77 -S="${WORKDIR}/${P}/src/${EGO_PN}"
78 -
79 -src_prepare() {
80 - default
81 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
82 - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
83 - -e "s/-s -w//" \
84 - Makefile || die
85 -}
86 -
87 -src_compile() {
88 - local options=(
89 - $(usev apparmor)
90 - $(usex btrfs "" "no_btrfs")
91 - $(usex cri "" "no_cri")
92 - $(usex device-mapper "" "no_devmapper")
93 - $(usev seccomp)
94 - $(usev selinux)
95 - )
96 -
97 - myemakeargs=(
98 - BUILDTAGS="${options[*]}"
99 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
100 - )
101 -
102 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
103 - export GOFLAGS="-v -x -mod=vendor"
104 - # race condition in man target https://bugs.gentoo.org/765100
105 - emake "${myemakeargs[@]}" man -j1 #nowarn
106 - emake "${myemakeargs[@]}" all
107 -}
108 -
109 -src_install() {
110 - dobin bin/*
111 - doman man/*
112 - newinitd "${FILESDIR}"/${PN}.initd "${PN}"
113 - keepdir /var/lib/containerd
114 -
115 - # we already installed manpages, remove markdown source
116 - # before installing docs directory
117 - rm -rf docs/man || die
118 - local DOCS=( README.md PLUGINS.md docs/. )
119 - einstalldocs
120 -}
121
122 diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild
123 deleted file mode 100644
124 index 2e7c01ad5a7..00000000000
125 --- a/app-emulation/containerd/containerd-1.3.9.ebuild
126 +++ /dev/null
127 @@ -1,85 +0,0 @@
128 -# Copyright 1999-2021 Gentoo Authors
129 -# Distributed under the terms of the GNU General Public License v2
130 -
131 -EAPI=7
132 -
133 -# update on bump, look for https://github.com/docker\
134 -# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
135 -CONTAINERD_COMMIT="ea765ab"
136 -EGO_PN="github.com/containerd/${PN}"
137 -
138 -inherit golang-vcs-snapshot toolchain-funcs
139 -
140 -DESCRIPTION="A daemon to control runC"
141 -HOMEPAGE="https://containerd.io/"
142 -SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
143 -
144 -LICENSE="Apache-2.0"
145 -SLOT="0"
146 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
147 -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
148 -
149 -DEPEND="
150 - btrfs? ( sys-fs/btrfs-progs )
151 - seccomp? ( sys-libs/libseccomp )
152 -"
153 -
154 -RDEPEND="
155 - ${DEPEND}
156 - ~app-emulation/runc-1.0.0_rc10
157 -"
158 -
159 -BDEPEND="
160 - dev-go/go-md2man
161 - virtual/pkgconfig
162 - test? ( "${RDEPEND}" )
163 -"
164 -
165 -# tests require root or docker
166 -# upstream does not recommend stripping binary
167 -RESTRICT+=" strip test"
168 -
169 -S="${WORKDIR}/${P}/src/${EGO_PN}"
170 -
171 -src_prepare() {
172 - default
173 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
174 - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
175 - -e "s/-s -w//" \
176 - Makefile || die
177 -}
178 -
179 -src_compile() {
180 - local options=(
181 - $(usev apparmor)
182 - $(usex btrfs "" "no_btrfs")
183 - $(usex cri "" "no_cri")
184 - $(usex device-mapper "" "no_devmapper")
185 - $(usev seccomp)
186 - $(usev selinux)
187 - )
188 -
189 - myemakeargs=(
190 - BUILDTAGS="${options[*]}"
191 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
192 - )
193 -
194 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
195 - export GOFLAGS="-v -x -mod=vendor"
196 - # race condition in man target https://bugs.gentoo.org/765100
197 - emake "${myemakeargs[@]}" man -j1 #nowarn
198 - emake "${myemakeargs[@]}" all
199 -}
200 -
201 -src_install() {
202 - dobin bin/*
203 - doman man/*
204 - newinitd "${FILESDIR}"/${PN}.initd "${PN}"
205 - keepdir /var/lib/containerd
206 -
207 - # we already installed manpages, remove markdown source
208 - # before installing docs directory
209 - rm -rf docs/man || die
210 - local DOCS=( README.md PLUGINS.md docs/. )
211 - einstalldocs
212 -}
213
214 diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.4.ebuild
215 deleted file mode 100644
216 index f6318700355..00000000000
217 --- a/app-emulation/containerd/containerd-1.4.4.ebuild
218 +++ /dev/null
219 @@ -1,83 +0,0 @@
220 -# Copyright 1999-2021 Gentoo Authors
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=7
224 -
225 -CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e
226 -EGO_PN="github.com/containerd/${PN}"
227 -inherit golang-vcs-snapshot toolchain-funcs
228 -
229 -DESCRIPTION="A daemon to control runC"
230 -HOMEPAGE="https://containerd.io/"
231 -SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
232 -
233 -LICENSE="Apache-2.0"
234 -SLOT="0"
235 -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
236 -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
237 -
238 -DEPEND="
239 - btrfs? ( sys-fs/btrfs-progs )
240 - seccomp? ( sys-libs/libseccomp )
241 -"
242 -
243 -RDEPEND="
244 - ${DEPEND}
245 - ~app-emulation/runc-1.0.0_rc92
246 -"
247 -
248 -BDEPEND="
249 - dev-go/go-md2man
250 - virtual/pkgconfig
251 - test? ( ${RDEPEND} )
252 -"
253 -
254 -# tests require root or docker
255 -# upstream does not recommend stripping binary
256 -RESTRICT+=" strip test"
257 -
258 -S="${WORKDIR}/${P}/src/${EGO_PN}"
259 -
260 -src_prepare() {
261 - default
262 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
263 - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
264 - -e "s/-s -w//" \
265 - Makefile || die
266 -}
267 -
268 -src_compile() {
269 - local options=(
270 - $(usev apparmor)
271 - $(usex btrfs "" "no_btrfs")
272 - $(usex cri "" "no_cri")
273 - $(usex device-mapper "" "no_devmapper")
274 - $(usev seccomp)
275 - $(usev selinux)
276 - )
277 -
278 - myemakeargs=(
279 - BUILDTAGS="${options[*]}"
280 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
281 - )
282 -
283 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
284 - export GOFLAGS="-v -x -mod=vendor"
285 - # race condition in man target https://bugs.gentoo.org/765100
286 - emake "${myemakeargs[@]}" man -j1 #nowarn
287 - emake "${myemakeargs[@]}" all
288 -}
289 -
290 -src_install() {
291 - dobin bin/*
292 - doman man/*
293 - newinitd "${FILESDIR}"/${PN}.initd "${PN}"
294 - keepdir /var/lib/containerd
295 -
296 - # we already installed manpages, remove markdown source
297 - # before installing docs directory
298 - rm -r docs/man || die
299 -
300 - local DOCS=( README.md PLUGINS.md docs/. )
301 - einstalldocs
302 -}