Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/
Date: Thu, 11 Apr 2019 21:42:36
Message-Id: 1555018944.3d67fa6776b4e150d6726b0508311a57e61df36f.zmedico@gentoo
1 commit: 3d67fa6776b4e150d6726b0508311a57e61df36f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 11 21:41:08 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 11 21:42:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d67fa67
7
8 app-emulation/libpod: remove old versions
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/libpod/Manifest | 2 -
14 app-emulation/libpod/libpod-0.12.1.2.ebuild | 106 ---------------------
15 app-emulation/libpod/libpod-1.0.1-r1.ebuild | 139 ----------------------------
16 app-emulation/libpod/libpod-1.0.1.ebuild | 108 ---------------------
17 4 files changed, 355 deletions(-)
18
19 diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
20 index ce3196b69d4..78c20acb7e4 100644
21 --- a/app-emulation/libpod/Manifest
22 +++ b/app-emulation/libpod/Manifest
23 @@ -1,3 +1 @@
24 -DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
25 -DIST libpod-1.0.1.tar.gz 6088749 BLAKE2B 64e28c6c7b60e226cae6a302e6e26ca5c2659d3c61910cc6fd2bbceec20485d7f2106d32da0472bc18a08bd611a6f0bf851b5c46066b47613783768c53a4c034 SHA512 23515fa3934ba2ec174011362ab1b67c747a7bf3122e606677ed40eb18aad28f79da30d09b6e1d0b74384286ff600fd1441fa4b6424e8bf3e410e867b57d92ef
26 DIST libpod-1.1.2.tar.gz 7878228 BLAKE2B 8974949843c6f966d48715df320e47b814e442e374e1393dd5a116c6f7222e9ce29f480205f6a58e213e6cead58e5b4f31fd776865911b22e517607349654d35 SHA512 55456fe03da0873d3f6c67ced25dbe98f6a5a14c3da64ab2b4a9c6161c1d727ec8cdfe5414b534531e440e8c86f909449f4026d66898b909924aba1744ec0682
27
28 diff --git a/app-emulation/libpod/libpod-0.12.1.2.ebuild b/app-emulation/libpod/libpod-0.12.1.2.ebuild
29 deleted file mode 100644
30 index 80dbb5f4f19..00000000000
31 --- a/app-emulation/libpod/libpod-0.12.1.2.ebuild
32 +++ /dev/null
33 @@ -1,106 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -EGIT_COMMIT="9551f6bb379d4af56dfb63ddf0f3682e40a6694e"
40 -EGO_PN="github.com/containers/${PN}"
41 -
42 -inherit golang-vcs-snapshot systemd
43 -
44 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
45 -HOMEPAGE="https://github.com/containers/libpod/"
46 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -
50 -KEYWORDS="~amd64"
51 -IUSE="apparmor btrfs ostree selinux"
52 -REQUIRED_USE="!selinux? ( !ostree )"
53 -RESTRICT="test"
54 -
55 -COMMON_DEPEND="
56 - app-crypt/gpgme:=
57 - >=app-emulation/cri-o-1.13.0
58 - app-emulation/runc
59 - dev-libs/libassuan:=
60 - dev-libs/libgpg-error:=
61 - sys-fs/lvm2
62 - sys-libs/libseccomp:=
63 -
64 - apparmor? ( sys-libs/libapparmor )
65 - btrfs? ( sys-fs/btrfs-progs )
66 - ostree? (
67 - dev-libs/glib:=
68 - dev-util/ostree:=
69 - )
70 - selinux? ( sys-libs/libselinux:= )
71 -"
72 -DEPEND="
73 - ${COMMON_DEPEND}
74 - dev-go/go-md2man"
75 -RDEPEND="${COMMON_DEPEND}"
76 -S="${WORKDIR}/${P}/src/${EGO_PN}"
77 -
78 -src_prepare() {
79 - default
80 -
81 - # Disable installation of python modules here, since those are
82 - # installed by separate ebuilds.
83 - sed -e '/^GIT_.*/d' \
84 - -e 's/$(GO) build/$(GO) build -v -work -x/' \
85 - -e 's/^\(install:.*\) install\.python$/\1/' \
86 - -i Makefile || die
87 -}
88 -
89 -src_compile() {
90 - [[ -f hack/apparmor_tag.sh ]] || die
91 - if use apparmor; then
92 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
93 - else
94 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
95 - fi
96 -
97 - [[ -f hack/btrfs_installed_tag.sh ]] || die
98 - if use btrfs; then
99 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
100 - else
101 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
102 - hack/btrfs_installed_tag.sh || die
103 - fi
104 -
105 - [[ -f hack/ostree_tag.sh ]] || die
106 - if use ostree; then
107 - echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
108 - else
109 - echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
110 - fi
111 -
112 - [[ -f hack/selinux_tag.sh ]] || die
113 - if use selinux; then
114 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
115 - else
116 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
117 - fi
118 -
119 - env -u LDFLAGS GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
120 - emake all \
121 - GIT_BRANCH=master \
122 - GIT_BRANCH_CLEAN=master \
123 - COMMIT_NO="${EGIT_COMMIT}" \
124 - GIT_COMMIT="${EGIT_COMMIT}"
125 -}
126 -
127 -src_install() {
128 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
129 -
130 - insinto /etc/containers
131 - newins test/registries.conf registries.conf.example
132 -
133 - newinitd "${FILESDIR}"/podman.initd podman
134 -
135 - insinto /etc/logrotate.d
136 - newins "${FILESDIR}/podman.logrotated" podman
137 -
138 - keepdir /var/lib/containers
139 -}
140
141 diff --git a/app-emulation/libpod/libpod-1.0.1-r1.ebuild b/app-emulation/libpod/libpod-1.0.1-r1.ebuild
142 deleted file mode 100644
143 index a02406b1ca8..00000000000
144 --- a/app-emulation/libpod/libpod-1.0.1-r1.ebuild
145 +++ /dev/null
146 @@ -1,139 +0,0 @@
147 -# Copyright 1999-2019 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=6
151 -
152 -EGIT_COMMIT="2c74edd0ac6509d6e533cb4e012e3e3f9e03434d"
153 -EGO_PN="github.com/containers/${PN}"
154 -
155 -inherit golang-vcs-snapshot systemd
156 -
157 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
158 -HOMEPAGE="https://github.com/containers/libpod/"
159 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
160 -LICENSE="Apache-2.0"
161 -SLOT="0"
162 -
163 -KEYWORDS="~amd64"
164 -IUSE="apparmor btrfs ostree +rootless selinux"
165 -REQUIRED_USE="!selinux? ( !ostree )"
166 -RESTRICT="test"
167 -
168 -COMMON_DEPEND="
169 - app-crypt/gpgme:=
170 - >=app-emulation/cri-o-1.13.0
171 - >=app-emulation/runc-1.0.0_rc6
172 - dev-libs/libassuan:=
173 - dev-libs/libgpg-error:=
174 - sys-fs/lvm2
175 - sys-libs/libseccomp:=
176 -
177 - apparmor? ( sys-libs/libapparmor )
178 - btrfs? ( sys-fs/btrfs-progs )
179 - ostree? (
180 - dev-libs/glib:=
181 - dev-util/ostree:=
182 - )
183 - rootless? ( app-emulation/slirp4netns )
184 - selinux? ( sys-libs/libselinux:= )
185 -"
186 -DEPEND="
187 - ${COMMON_DEPEND}
188 - dev-go/go-md2man"
189 -RDEPEND="${COMMON_DEPEND}"
190 -S="${WORKDIR}/${P}/src/${EGO_PN}"
191 -
192 -src_prepare() {
193 - default
194 -
195 - # Disable installation of python modules here, since those are
196 - # installed by separate ebuilds.
197 - sed -e '/^GIT_.*/d' \
198 - -e 's/$(GO) build/$(GO) build -v -work -x/' \
199 - -e 's/^\(install:.*\) install\.python$/\1/' \
200 - -i Makefile || die
201 -}
202 -
203 -src_compile() {
204 - [[ -f hack/apparmor_tag.sh ]] || die
205 - if use apparmor; then
206 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
207 - else
208 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
209 - fi
210 -
211 - [[ -f hack/btrfs_installed_tag.sh ]] || die
212 - if use btrfs; then
213 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
214 - else
215 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
216 - hack/btrfs_installed_tag.sh || die
217 - fi
218 -
219 - [[ -f hack/ostree_tag.sh ]] || die
220 - if use ostree; then
221 - echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
222 - else
223 - echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
224 - fi
225 -
226 - [[ -f hack/selinux_tag.sh ]] || die
227 - if use selinux; then
228 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
229 - else
230 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
231 - fi
232 -
233 - env -u LDFLAGS GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
234 - emake all \
235 - GIT_BRANCH=master \
236 - GIT_BRANCH_CLEAN=master \
237 - COMMIT_NO="${EGIT_COMMIT}" \
238 - GIT_COMMIT="${EGIT_COMMIT}"
239 -}
240 -
241 -src_install() {
242 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
243 -
244 - insinto /etc/containers
245 - newins test/registries.conf registries.conf.example
246 - newins test/policy.json policy.json.example
247 -
248 - newinitd "${FILESDIR}"/podman.initd podman
249 -
250 - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
251 -
252 - insinto /etc/logrotate.d
253 - newins "${FILESDIR}/podman.logrotated" podman
254 -
255 - keepdir /var/lib/containers
256 -}
257 -
258 -pkg_preinst() {
259 - LIBPOD_ROOTLESS_UPGRADE=false
260 - if use rootless; then
261 - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
262 - fi
263 -}
264 -
265 -pkg_postinst() {
266 - local want_newline=false
267 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
268 - elog "You need to create the following config files:"
269 - elog "/etc/containers/registries.conf"
270 - elog "/etc/containers/policy.json"
271 - elog "To copy over default examples, use:"
272 - elog "cp /etc/containers/registries.conf{.example,}"
273 - elog "cp /etc/containers/policy.json{.example,}"
274 - want_newline=true
275 - fi
276 - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
277 - ${want_newline} && elog ""
278 - elog "For rootless operation, you need to configure subuid/subgid"
279 - elog "for user running podman. In case subuid/subgid has only been"
280 - elog "configured for root, run:"
281 - elog "usermod --add-subuids 1065536-1131071 <user>"
282 - elog "usermod --add-subgids 1065536-1131071 <user>"
283 - want_newline=true
284 - fi
285 -}
286
287 diff --git a/app-emulation/libpod/libpod-1.0.1.ebuild b/app-emulation/libpod/libpod-1.0.1.ebuild
288 deleted file mode 100644
289 index 584d3ba095f..00000000000
290 --- a/app-emulation/libpod/libpod-1.0.1.ebuild
291 +++ /dev/null
292 @@ -1,108 +0,0 @@
293 -# Copyright 1999-2019 Gentoo Authors
294 -# Distributed under the terms of the GNU General Public License v2
295 -
296 -EAPI=6
297 -
298 -EGIT_COMMIT="2c74edd0ac6509d6e533cb4e012e3e3f9e03434d"
299 -EGO_PN="github.com/containers/${PN}"
300 -
301 -inherit golang-vcs-snapshot systemd
302 -
303 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
304 -HOMEPAGE="https://github.com/containers/libpod/"
305 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
306 -LICENSE="Apache-2.0"
307 -SLOT="0"
308 -
309 -KEYWORDS="~amd64"
310 -IUSE="apparmor btrfs ostree selinux"
311 -REQUIRED_USE="!selinux? ( !ostree )"
312 -RESTRICT="test"
313 -
314 -COMMON_DEPEND="
315 - app-crypt/gpgme:=
316 - >=app-emulation/cri-o-1.13.0
317 - app-emulation/runc
318 - dev-libs/libassuan:=
319 - dev-libs/libgpg-error:=
320 - sys-fs/lvm2
321 - sys-libs/libseccomp:=
322 -
323 - apparmor? ( sys-libs/libapparmor )
324 - btrfs? ( sys-fs/btrfs-progs )
325 - ostree? (
326 - dev-libs/glib:=
327 - dev-util/ostree:=
328 - )
329 - selinux? ( sys-libs/libselinux:= )
330 -"
331 -DEPEND="
332 - ${COMMON_DEPEND}
333 - dev-go/go-md2man"
334 -RDEPEND="${COMMON_DEPEND}"
335 -S="${WORKDIR}/${P}/src/${EGO_PN}"
336 -
337 -src_prepare() {
338 - default
339 -
340 - # Disable installation of python modules here, since those are
341 - # installed by separate ebuilds.
342 - sed -e '/^GIT_.*/d' \
343 - -e 's/$(GO) build/$(GO) build -v -work -x/' \
344 - -e 's/^\(install:.*\) install\.python$/\1/' \
345 - -i Makefile || die
346 -}
347 -
348 -src_compile() {
349 - [[ -f hack/apparmor_tag.sh ]] || die
350 - if use apparmor; then
351 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
352 - else
353 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
354 - fi
355 -
356 - [[ -f hack/btrfs_installed_tag.sh ]] || die
357 - if use btrfs; then
358 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
359 - else
360 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
361 - hack/btrfs_installed_tag.sh || die
362 - fi
363 -
364 - [[ -f hack/ostree_tag.sh ]] || die
365 - if use ostree; then
366 - echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
367 - else
368 - echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
369 - fi
370 -
371 - [[ -f hack/selinux_tag.sh ]] || die
372 - if use selinux; then
373 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
374 - else
375 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
376 - fi
377 -
378 - env -u LDFLAGS GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
379 - emake all \
380 - GIT_BRANCH=master \
381 - GIT_BRANCH_CLEAN=master \
382 - COMMIT_NO="${EGIT_COMMIT}" \
383 - GIT_COMMIT="${EGIT_COMMIT}"
384 -}
385 -
386 -src_install() {
387 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
388 -
389 - insinto /etc/containers
390 - newins test/registries.conf registries.conf.example
391 -
392 - newinitd "${FILESDIR}"/podman.initd podman
393 -
394 - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
395 -
396 - insinto /etc/logrotate.d
397 - newins "${FILESDIR}/podman.logrotated" podman
398 -
399 - keepdir /var/lib/containers
400 -}