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, 04 Jul 2019 15:35:22
Message-Id: 1562254496.37115c974ee894253dd3daed491eee2f13129c29.mrueg@gentoo
1 commit: 37115c974ee894253dd3daed491eee2f13129c29
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 4 15:34:56 2019 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 4 15:34:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37115c97
7
8 app-emulation/containerd: Remove old and unmaintained live
9
10 Package-Manager: Portage-2.3.68, Repoman-2.3.16
11 Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>
12
13 app-emulation/containerd/Manifest | 3 --
14 app-emulation/containerd/containerd-1.1.2.ebuild | 55 -----------------------
15 app-emulation/containerd/containerd-1.1.4.ebuild | 55 -----------------------
16 app-emulation/containerd/containerd-1.2.5.ebuild | 56 ------------------------
17 app-emulation/containerd/containerd-9999.ebuild | 40 -----------------
18 5 files changed, 209 deletions(-)
19
20 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
21 index 11961b23491..989fa636800 100644
22 --- a/app-emulation/containerd/Manifest
23 +++ b/app-emulation/containerd/Manifest
24 @@ -1,4 +1 @@
25 -DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
26 -DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
27 -DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0 SHA512 b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25
28 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
29
30 diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild b/app-emulation/containerd/containerd-1.1.2.ebuild
31 deleted file mode 100644
32 index b37434d5661..00000000000
33 --- a/app-emulation/containerd/containerd-1.1.2.ebuild
34 +++ /dev/null
35 @@ -1,55 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -EGO_PN="github.com/containerd/${PN}"
41 -
42 -inherit toolchain-funcs
43 -
44 -if [[ ${PV} == *9999 ]]; then
45 - inherit golang-vcs
46 -else
47 - MY_PV="${PV/_rc/-rc.}"
48 - EGIT_COMMIT="v${MY_PV}"
49 - CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e"
50 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
51 - KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
52 - inherit golang-vcs-snapshot
53 -fi
54 -
55 -DESCRIPTION="A daemon to control runC"
56 -HOMEPAGE="https://containerd.tools"
57 -
58 -LICENSE="Apache-2.0"
59 -SLOT="0"
60 -IUSE="apparmor +btrfs +cri hardened +seccomp"
61 -
62 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
63 - seccomp? ( sys-libs/libseccomp )"
64 -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
65 - >=app-emulation/runc-1.0.0_rc4 )
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 - dobin bin/containerd{-shim,-stress,} bin/ctr
90 -}
91
92 diff --git a/app-emulation/containerd/containerd-1.1.4.ebuild b/app-emulation/containerd/containerd-1.1.4.ebuild
93 deleted file mode 100644
94 index 0d07ff805fc..00000000000
95 --- a/app-emulation/containerd/containerd-1.1.4.ebuild
96 +++ /dev/null
97 @@ -1,55 +0,0 @@
98 -# Copyright 1999-2018 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=6
102 -EGO_PN="github.com/containerd/${PN}"
103 -
104 -inherit toolchain-funcs
105 -
106 -if [[ ${PV} == *9999 ]]; then
107 - inherit golang-vcs
108 -else
109 - MY_PV="${PV/_rc/-rc.}"
110 - EGIT_COMMIT="v${MY_PV}"
111 - CONTAINERD_COMMIT="9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
112 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
113 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
114 - inherit golang-vcs-snapshot
115 -fi
116 -
117 -DESCRIPTION="A daemon to control runC"
118 -HOMEPAGE="https://containerd.tools"
119 -
120 -LICENSE="Apache-2.0"
121 -SLOT="0"
122 -IUSE="apparmor +btrfs +cri hardened +seccomp"
123 -
124 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
125 - seccomp? ( sys-libs/libseccomp )"
126 -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
127 - >=app-emulation/runc-1.0.0_rc4 )
128 - seccomp? ( sys-libs/libseccomp )"
129 -
130 -S=${WORKDIR}/${P}/src/${EGO_PN}
131 -
132 -RESTRICT="test"
133 -
134 -src_prepare() {
135 - default
136 - if [[ ${PV} != *9999* ]]; then
137 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
138 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
139 - -e "s/-s -w//" \
140 - Makefile || die
141 - fi
142 -}
143 -
144 -src_compile() {
145 - local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
146 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
147 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
148 -}
149 -
150 -src_install() {
151 - dobin bin/containerd{-shim,-stress,} bin/ctr
152 -}
153
154 diff --git a/app-emulation/containerd/containerd-1.2.5.ebuild b/app-emulation/containerd/containerd-1.2.5.ebuild
155 deleted file mode 100644
156 index 4df44a02efb..00000000000
157 --- a/app-emulation/containerd/containerd-1.2.5.ebuild
158 +++ /dev/null
159 @@ -1,56 +0,0 @@
160 -# Copyright 1999-2019 Gentoo Authors
161 -# Distributed under the terms of the GNU General Public License v2
162 -
163 -EAPI=6
164 -EGO_PN="github.com/containerd/${PN}"
165 -
166 -inherit toolchain-funcs
167 -
168 -if [[ ${PV} == *9999 ]]; then
169 - inherit golang-vcs
170 -else
171 - MY_PV="${PV/_rc/-rc.}"
172 - EGIT_COMMIT="v${MY_PV}"
173 - CONTAINERD_COMMIT="bb71b10fd8f58240ca47fbb579b9d1028eea7c84"
174 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
175 - KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
176 - inherit golang-vcs-snapshot
177 -fi
178 -
179 -DESCRIPTION="A daemon to control runC"
180 -HOMEPAGE="https://containerd.tools"
181 -
182 -LICENSE="Apache-2.0"
183 -SLOT="0"
184 -IUSE="apparmor +btrfs +cri hardened +seccomp"
185 -
186 -DEPEND="btrfs? ( sys-fs/btrfs-progs )
187 - seccomp? ( sys-libs/libseccomp )"
188 -RDEPEND=">=app-emulation/runc-1.0.0_rc5
189 - seccomp? ( sys-libs/libseccomp )"
190 -
191 -S=${WORKDIR}/${P}/src/${EGO_PN}
192 -
193 -RESTRICT="test"
194 -
195 -src_prepare() {
196 - default
197 - if [[ ${PV} != *9999* ]]; then
198 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
199 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
200 - -e "s/-s -w//" \
201 - Makefile || die
202 - fi
203 -}
204 -
205 -src_compile() {
206 - local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
207 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
208 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
209 -}
210 -
211 -src_install() {
212 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
213 - keepdir /var/lib/containerd
214 - dobin bin/*
215 -}
216
217 diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
218 deleted file mode 100644
219 index 345b3fa9b96..00000000000
220 --- a/app-emulation/containerd/containerd-9999.ebuild
221 +++ /dev/null
222 @@ -1,40 +0,0 @@
223 -# Copyright 1999-2017 Gentoo Foundation
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -EAPI=6
227 -EGO_PN="github.com/containerd/${PN}"
228 -
229 -inherit toolchain-funcs
230 -
231 -if [[ ${PV} == *9999 ]]; then
232 - inherit golang-vcs
233 -else
234 - MY_PV="${PV/_beta/-beta.}"
235 - EGIT_COMMIT="v${MY_PV}"
236 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
237 - KEYWORDS="~amd64 ~arm ~ppc64"
238 - inherit golang-vcs-snapshot
239 -fi
240 -
241 -DESCRIPTION="A daemon to control runC"
242 -HOMEPAGE="https://containerd.tools"
243 -
244 -LICENSE="Apache-2.0"
245 -SLOT="0"
246 -IUSE="hardened +seccomp"
247 -
248 -DEPEND=""
249 -RDEPEND=">=app-emulation/runc-1.0.0_rc4
250 - seccomp? ( sys-libs/libseccomp )"
251 -
252 -S=${WORKDIR}/${P}/src/${EGO_PN}
253 -
254 -src_compile() {
255 - local options=( $(usex seccomp "seccomp" "") )
256 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
257 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
258 -}
259 -
260 -src_install() {
261 - dobin bin/containerd{-shim,-stress,} bin/ctr
262 -}