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