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-containers/podman/
Date: Fri, 24 Dec 2021 22:34:14
Message-Id: 1640385239.6dd586ae5328b3b97603f1274fb98e0b0e34c3fe.zmedico@gentoo
1 commit: 6dd586ae5328b3b97603f1274fb98e0b0e34c3fe
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 22:31:42 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 22:33:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd586ae
7
8 app-containers/podman: Remove old versions
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-containers/podman/Manifest | 4 -
14 app-containers/podman/podman-3.3.1.ebuild | 164 ------------------------------
15 app-containers/podman/podman-3.4.0.ebuild | 164 ------------------------------
16 app-containers/podman/podman-3.4.2.ebuild | 164 ------------------------------
17 app-containers/podman/podman-3.4.3.ebuild | 164 ------------------------------
18 5 files changed, 660 deletions(-)
19
20 diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
21 index 4ea7bfdb909f..9de658e984fe 100644
22 --- a/app-containers/podman/Manifest
23 +++ b/app-containers/podman/Manifest
24 @@ -1,6 +1,2 @@
25 -DIST podman-3.3.1.tar.gz 10917305 BLAKE2B fe7856c2ad8893e40ec42fb242a088794ea18910388d5e8089885013cab45c98e03bef99a5e911749f95ce469518e6fa5b6d30400f52696645c9ba8c140ba445 SHA512 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa
26 -DIST podman-3.4.0.tar.gz 10950594 BLAKE2B 4a96b9be980f336bc7cfa6efa0f955da90b67e1ff3e45c34097b9eb4fcd611b3454860048410238aeb1063331b246e9c156f738813e7f585d2254a1568d20642 SHA512 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1
27 DIST podman-3.4.1.tar.gz 10953738 BLAKE2B 423aaecabce5242ae87887e36e9caaf499b3d5c18978e47b738ef3b6a0a094c64f18f5fef614193157c3de0a6c0d88a232efcdcb60de4ae8ab14abbe266ad512 SHA512 b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e
28 -DIST podman-3.4.2.tar.gz 10959727 BLAKE2B 6c5ead8f4dc6e79edeb16e72fb906c6aa77f84b53bdd2435f100f923f7cb708c68898d3a1837db2c154700730adcedfb9769b996b5f602954f8388fda09c3650 SHA512 849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2
29 -DIST podman-3.4.3.tar.gz 10945852 BLAKE2B cb2076be27900b2ce4d781fa94592503d3b0421535e225e0166477aede4892b7f2b428a4f466daa6c85f3c479f8f197194d2b827afe5dd1b3b7c3e9c7829f800 SHA512 c3eed482ac78a70f9babb39798a2925f29d0452f5e66f2e46f8eb9bb8aeeb4cd8392a9d961a9a37fc5aa3bccad8fb6754db65191b80f3ad882d72a329722994f
30 DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
31
32 diff --git a/app-containers/podman/podman-3.3.1.ebuild b/app-containers/podman/podman-3.3.1.ebuild
33 deleted file mode 100644
34 index 0d45638721e4..000000000000
35 --- a/app-containers/podman/podman-3.3.1.ebuild
36 +++ /dev/null
37 @@ -1,164 +0,0 @@
38 -# Copyright 1999-2021 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -EGIT_COMMIT="4c5283fabff2de5145838f1847a5a7b2b1fbc0a5"
43 -
44 -inherit bash-completion-r1 flag-o-matic go-module tmpfiles
45 -
46 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
47 -HOMEPAGE="https://github.com/containers/podman/"
48 -MY_PN=podman
49 -MY_P=${MY_PN}-${PV}
50 -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
51 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
52 -SLOT="0"
53 -
54 -KEYWORDS="~amd64 ~arm64 ~ppc64"
55 -IUSE="apparmor btrfs +fuse +rootless selinux"
56 -RESTRICT="test"
57 -
58 -COMMON_DEPEND="
59 - app-crypt/gpgme:=
60 - >=app-containers/conmon-2.0.0
61 - || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
62 - dev-libs/libassuan:=
63 - dev-libs/libgpg-error:=
64 - >=net-misc/cni-plugins-0.8.6
65 - sys-fs/lvm2
66 - sys-libs/libseccomp:=
67 -
68 - apparmor? ( sys-libs/libapparmor )
69 - btrfs? ( sys-fs/btrfs-progs )
70 - rootless? ( app-containers/slirp4netns )
71 - selinux? ( sys-libs/libselinux:= )
72 -"
73 -DEPEND="
74 - ${COMMON_DEPEND}
75 - dev-go/go-md2man"
76 -RDEPEND="${COMMON_DEPEND}
77 - fuse? ( sys-fs/fuse-overlayfs )"
78 -
79 -S=${WORKDIR}/${MY_P}
80 -
81 -src_prepare() {
82 - default
83 -
84 - # Disable installation of python modules here, since those are
85 - # installed by separate ebuilds.
86 - local makefile_sed_args=(
87 - -e '/^GIT_.*/d'
88 - -e 's/$(GO) build/$(GO) build -v -work -x/'
89 - -e 's/^\(install:.*\) install\.python$/\1/'
90 - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
91 - )
92 -
93 - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
94 -
95 - sed "${makefile_sed_args[@]}" -i Makefile || die
96 -
97 - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
98 - -i hack/get_release_info.sh || die
99 -}
100 -
101 -src_compile() {
102 - local git_commiT=${EGIT_COMMIT}
103 -
104 - # Filter unsupported linker flags
105 - filter-flags '-Wl,*'
106 -
107 - [[ -f hack/apparmor_tag.sh ]] || die
108 - if use apparmor; then
109 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
110 - else
111 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
112 - fi
113 -
114 - [[ -f hack/btrfs_installed_tag.sh ]] || die
115 - if use btrfs; then
116 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
117 - else
118 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
119 - hack/btrfs_installed_tag.sh || die
120 - fi
121 -
122 - [[ -f hack/selinux_tag.sh ]] || die
123 - if use selinux; then
124 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
125 - else
126 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
127 - fi
128 -
129 - # Avoid this error when generating pkg/varlink/iopodman.go:
130 - # cannot find package "github.com/varlink/go/varlink/idl"
131 - mkdir -p _output || die
132 - ln -snf ../vendor _output/src || die
133 - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
134 - rm _output/src || die
135 -
136 - export -n GOCACHE GOPATH XDG_CACHE_HOME
137 - GOBIN="${S}/bin" \
138 - emake all \
139 - GIT_BRANCH=master \
140 - GIT_BRANCH_CLEAN=master \
141 - COMMIT_NO="${git_commit}" \
142 - GIT_COMMIT="${git_commit}"
143 -}
144 -
145 -src_install() {
146 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
147 -
148 - insinto /etc/containers
149 - newins test/registries.conf registries.conf.example
150 - newins test/policy.json policy.json.example
151 -
152 - insinto /usr/share/containers
153 - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
154 -
155 - newconfd "${FILESDIR}"/podman.confd podman
156 - newinitd "${FILESDIR}"/podman.initd podman
157 -
158 - insinto /etc/logrotate.d
159 - newins "${FILESDIR}/podman.logrotated" podman
160 -
161 - dobashcomp completions/bash/*
162 -
163 - insinto /usr/share/zsh/site-functions
164 - doins completions/zsh/*
165 -
166 - insinto /usr/share/fish/vendor_completions.d
167 - doins completions/fish/*
168 -
169 - keepdir /var/lib/containers
170 -}
171 -
172 -pkg_preinst() {
173 - PODMAN_ROOTLESS_UPGRADE=false
174 - if use rootless; then
175 - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
176 - fi
177 -}
178 -
179 -pkg_postinst() {
180 - tmpfiles_process podman.conf
181 -
182 - local want_newline=false
183 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
184 - elog "You need to create the following config files:"
185 - elog "/etc/containers/registries.conf"
186 - elog "/etc/containers/policy.json"
187 - elog "To copy over default examples, use:"
188 - elog "cp /etc/containers/registries.conf{.example,}"
189 - elog "cp /etc/containers/policy.json{.example,}"
190 - want_newline=true
191 - fi
192 - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
193 - ${want_newline} && elog ""
194 - elog "For rootless operation, you need to configure subuid/subgid"
195 - elog "for user running podman. In case subuid/subgid has only been"
196 - elog "configured for root, run:"
197 - elog "usermod --add-subuids 1065536-1131071 <user>"
198 - elog "usermod --add-subgids 1065536-1131071 <user>"
199 - want_newline=true
200 - fi
201 -}
202
203 diff --git a/app-containers/podman/podman-3.4.0.ebuild b/app-containers/podman/podman-3.4.0.ebuild
204 deleted file mode 100644
205 index cbad65d0e440..000000000000
206 --- a/app-containers/podman/podman-3.4.0.ebuild
207 +++ /dev/null
208 @@ -1,164 +0,0 @@
209 -# Copyright 1999-2021 Gentoo Authors
210 -# Distributed under the terms of the GNU General Public License v2
211 -
212 -EAPI=7
213 -EGIT_COMMIT="6e8de00bb224f9931d7402648f0177e7357ed079"
214 -
215 -inherit bash-completion-r1 flag-o-matic go-module tmpfiles
216 -
217 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
218 -HOMEPAGE="https://github.com/containers/podman/"
219 -MY_PN=podman
220 -MY_P=${MY_PN}-${PV}
221 -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
222 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
223 -SLOT="0"
224 -
225 -KEYWORDS="~amd64 ~arm64 ~ppc64"
226 -IUSE="apparmor btrfs +fuse +rootless selinux"
227 -RESTRICT+=" test"
228 -
229 -COMMON_DEPEND="
230 - app-crypt/gpgme:=
231 - >=app-containers/conmon-2.0.0
232 - || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
233 - dev-libs/libassuan:=
234 - dev-libs/libgpg-error:=
235 - >=net-misc/cni-plugins-0.8.6
236 - sys-fs/lvm2
237 - sys-libs/libseccomp:=
238 -
239 - apparmor? ( sys-libs/libapparmor )
240 - btrfs? ( sys-fs/btrfs-progs )
241 - rootless? ( app-containers/slirp4netns )
242 - selinux? ( sys-libs/libselinux:= )
243 -"
244 -DEPEND="
245 - ${COMMON_DEPEND}
246 - dev-go/go-md2man"
247 -RDEPEND="${COMMON_DEPEND}
248 - fuse? ( sys-fs/fuse-overlayfs )"
249 -
250 -S=${WORKDIR}/${MY_P}
251 -
252 -src_prepare() {
253 - default
254 -
255 - # Disable installation of python modules here, since those are
256 - # installed by separate ebuilds.
257 - local makefile_sed_args=(
258 - -e '/^GIT_.*/d'
259 - -e 's/$(GO) build/$(GO) build -v -work -x/'
260 - -e 's/^\(install:.*\) install\.python$/\1/'
261 - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
262 - )
263 -
264 - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
265 -
266 - sed "${makefile_sed_args[@]}" -i Makefile || die
267 -
268 - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
269 - -i hack/get_release_info.sh || die
270 -}
271 -
272 -src_compile() {
273 - local git_commiT=${EGIT_COMMIT}
274 -
275 - # Filter unsupported linker flags
276 - filter-flags '-Wl,*'
277 -
278 - [[ -f hack/apparmor_tag.sh ]] || die
279 - if use apparmor; then
280 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
281 - else
282 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
283 - fi
284 -
285 - [[ -f hack/btrfs_installed_tag.sh ]] || die
286 - if use btrfs; then
287 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
288 - else
289 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
290 - hack/btrfs_installed_tag.sh || die
291 - fi
292 -
293 - [[ -f hack/selinux_tag.sh ]] || die
294 - if use selinux; then
295 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
296 - else
297 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
298 - fi
299 -
300 - # Avoid this error when generating pkg/varlink/iopodman.go:
301 - # cannot find package "github.com/varlink/go/varlink/idl"
302 - mkdir -p _output || die
303 - ln -snf ../vendor _output/src || die
304 - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
305 - rm _output/src || die
306 -
307 - export -n GOCACHE GOPATH XDG_CACHE_HOME
308 - GOBIN="${S}/bin" \
309 - emake all \
310 - GIT_BRANCH=master \
311 - GIT_BRANCH_CLEAN=master \
312 - COMMIT_NO="${git_commit}" \
313 - GIT_COMMIT="${git_commit}"
314 -}
315 -
316 -src_install() {
317 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
318 -
319 - insinto /etc/containers
320 - newins test/registries.conf registries.conf.example
321 - newins test/policy.json policy.json.example
322 -
323 - insinto /usr/share/containers
324 - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
325 -
326 - newconfd "${FILESDIR}"/podman.confd podman
327 - newinitd "${FILESDIR}"/podman.initd podman
328 -
329 - insinto /etc/logrotate.d
330 - newins "${FILESDIR}/podman.logrotated" podman
331 -
332 - dobashcomp completions/bash/*
333 -
334 - insinto /usr/share/zsh/site-functions
335 - doins completions/zsh/*
336 -
337 - insinto /usr/share/fish/vendor_completions.d
338 - doins completions/fish/*
339 -
340 - keepdir /var/lib/containers
341 -}
342 -
343 -pkg_preinst() {
344 - PODMAN_ROOTLESS_UPGRADE=false
345 - if use rootless; then
346 - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
347 - fi
348 -}
349 -
350 -pkg_postinst() {
351 - tmpfiles_process podman.conf
352 -
353 - local want_newline=false
354 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
355 - elog "You need to create the following config files:"
356 - elog "/etc/containers/registries.conf"
357 - elog "/etc/containers/policy.json"
358 - elog "To copy over default examples, use:"
359 - elog "cp /etc/containers/registries.conf{.example,}"
360 - elog "cp /etc/containers/policy.json{.example,}"
361 - want_newline=true
362 - fi
363 - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
364 - ${want_newline} && elog ""
365 - elog "For rootless operation, you need to configure subuid/subgid"
366 - elog "for user running podman. In case subuid/subgid has only been"
367 - elog "configured for root, run:"
368 - elog "usermod --add-subuids 1065536-1131071 <user>"
369 - elog "usermod --add-subgids 1065536-1131071 <user>"
370 - want_newline=true
371 - fi
372 -}
373
374 diff --git a/app-containers/podman/podman-3.4.2.ebuild b/app-containers/podman/podman-3.4.2.ebuild
375 deleted file mode 100644
376 index f27fd5123313..000000000000
377 --- a/app-containers/podman/podman-3.4.2.ebuild
378 +++ /dev/null
379 @@ -1,164 +0,0 @@
380 -# Copyright 1999-2021 Gentoo Authors
381 -# Distributed under the terms of the GNU General Public License v2
382 -
383 -EAPI=7
384 -EGIT_COMMIT="2ad1fd3555de12de34e20898cc2ef901f08fe5ed"
385 -
386 -inherit bash-completion-r1 flag-o-matic go-module tmpfiles
387 -
388 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
389 -HOMEPAGE="https://github.com/containers/podman/"
390 -MY_PN=podman
391 -MY_P=${MY_PN}-${PV}
392 -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
393 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
394 -SLOT="0"
395 -
396 -KEYWORDS="~amd64 ~arm64 ~ppc64"
397 -IUSE="apparmor btrfs +fuse +rootless selinux"
398 -RESTRICT+=" test"
399 -
400 -COMMON_DEPEND="
401 - app-crypt/gpgme:=
402 - >=app-containers/conmon-2.0.0
403 - || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
404 - dev-libs/libassuan:=
405 - dev-libs/libgpg-error:=
406 - >=net-misc/cni-plugins-0.8.6
407 - sys-fs/lvm2
408 - sys-libs/libseccomp:=
409 -
410 - apparmor? ( sys-libs/libapparmor )
411 - btrfs? ( sys-fs/btrfs-progs )
412 - rootless? ( app-containers/slirp4netns )
413 - selinux? ( sys-libs/libselinux:= )
414 -"
415 -DEPEND="
416 - ${COMMON_DEPEND}
417 - dev-go/go-md2man"
418 -RDEPEND="${COMMON_DEPEND}
419 - fuse? ( sys-fs/fuse-overlayfs )"
420 -
421 -S=${WORKDIR}/${MY_P}
422 -
423 -src_prepare() {
424 - default
425 -
426 - # Disable installation of python modules here, since those are
427 - # installed by separate ebuilds.
428 - local makefile_sed_args=(
429 - -e '/^GIT_.*/d'
430 - -e 's/$(GO) build/$(GO) build -v -work -x/'
431 - -e 's/^\(install:.*\) install\.python$/\1/'
432 - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
433 - )
434 -
435 - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
436 -
437 - sed "${makefile_sed_args[@]}" -i Makefile || die
438 -
439 - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
440 - -i hack/get_release_info.sh || die
441 -}
442 -
443 -src_compile() {
444 - local git_commiT=${EGIT_COMMIT}
445 -
446 - # Filter unsupported linker flags
447 - filter-flags '-Wl,*'
448 -
449 - [[ -f hack/apparmor_tag.sh ]] || die
450 - if use apparmor; then
451 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
452 - else
453 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
454 - fi
455 -
456 - [[ -f hack/btrfs_installed_tag.sh ]] || die
457 - if use btrfs; then
458 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
459 - else
460 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
461 - hack/btrfs_installed_tag.sh || die
462 - fi
463 -
464 - [[ -f hack/selinux_tag.sh ]] || die
465 - if use selinux; then
466 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
467 - else
468 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
469 - fi
470 -
471 - # Avoid this error when generating pkg/varlink/iopodman.go:
472 - # cannot find package "github.com/varlink/go/varlink/idl"
473 - mkdir -p _output || die
474 - ln -snf ../vendor _output/src || die
475 - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
476 - rm _output/src || die
477 -
478 - export -n GOCACHE GOPATH XDG_CACHE_HOME
479 - GOBIN="${S}/bin" \
480 - emake all \
481 - GIT_BRANCH=master \
482 - GIT_BRANCH_CLEAN=master \
483 - COMMIT_NO="${git_commit}" \
484 - GIT_COMMIT="${git_commit}"
485 -}
486 -
487 -src_install() {
488 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
489 -
490 - insinto /etc/containers
491 - newins test/registries.conf registries.conf.example
492 - newins test/policy.json policy.json.example
493 -
494 - insinto /usr/share/containers
495 - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
496 -
497 - newconfd "${FILESDIR}"/podman.confd podman
498 - newinitd "${FILESDIR}"/podman.initd podman
499 -
500 - insinto /etc/logrotate.d
501 - newins "${FILESDIR}/podman.logrotated" podman
502 -
503 - dobashcomp completions/bash/*
504 -
505 - insinto /usr/share/zsh/site-functions
506 - doins completions/zsh/*
507 -
508 - insinto /usr/share/fish/vendor_completions.d
509 - doins completions/fish/*
510 -
511 - keepdir /var/lib/containers
512 -}
513 -
514 -pkg_preinst() {
515 - PODMAN_ROOTLESS_UPGRADE=false
516 - if use rootless; then
517 - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
518 - fi
519 -}
520 -
521 -pkg_postinst() {
522 - tmpfiles_process podman.conf
523 -
524 - local want_newline=false
525 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
526 - elog "You need to create the following config files:"
527 - elog "/etc/containers/registries.conf"
528 - elog "/etc/containers/policy.json"
529 - elog "To copy over default examples, use:"
530 - elog "cp /etc/containers/registries.conf{.example,}"
531 - elog "cp /etc/containers/policy.json{.example,}"
532 - want_newline=true
533 - fi
534 - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
535 - ${want_newline} && elog ""
536 - elog "For rootless operation, you need to configure subuid/subgid"
537 - elog "for user running podman. In case subuid/subgid has only been"
538 - elog "configured for root, run:"
539 - elog "usermod --add-subuids 1065536-1131071 <user>"
540 - elog "usermod --add-subgids 1065536-1131071 <user>"
541 - want_newline=true
542 - fi
543 -}
544
545 diff --git a/app-containers/podman/podman-3.4.3.ebuild b/app-containers/podman/podman-3.4.3.ebuild
546 deleted file mode 100644
547 index 419c47b5d16f..000000000000
548 --- a/app-containers/podman/podman-3.4.3.ebuild
549 +++ /dev/null
550 @@ -1,164 +0,0 @@
551 -# Copyright 1999-2021 Gentoo Authors
552 -# Distributed under the terms of the GNU General Public License v2
553 -
554 -EAPI=7
555 -EGIT_COMMIT="3450a60d2196cc0bee8a3fc28a7c93a7370d4515"
556 -
557 -inherit bash-completion-r1 flag-o-matic go-module tmpfiles
558 -
559 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
560 -HOMEPAGE="https://github.com/containers/podman/"
561 -MY_PN=podman
562 -MY_P=${MY_PN}-${PV}
563 -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
564 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
565 -SLOT="0"
566 -
567 -KEYWORDS="~amd64 ~arm64 ~ppc64"
568 -IUSE="apparmor btrfs +fuse +rootless selinux"
569 -RESTRICT+=" test"
570 -
571 -COMMON_DEPEND="
572 - app-crypt/gpgme:=
573 - >=app-containers/conmon-2.0.0
574 - || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
575 - dev-libs/libassuan:=
576 - dev-libs/libgpg-error:=
577 - >=net-misc/cni-plugins-0.8.6
578 - sys-fs/lvm2
579 - sys-libs/libseccomp:=
580 -
581 - apparmor? ( sys-libs/libapparmor )
582 - btrfs? ( sys-fs/btrfs-progs )
583 - rootless? ( app-containers/slirp4netns )
584 - selinux? ( sys-libs/libselinux:= )
585 -"
586 -DEPEND="
587 - ${COMMON_DEPEND}
588 - dev-go/go-md2man"
589 -RDEPEND="${COMMON_DEPEND}
590 - fuse? ( sys-fs/fuse-overlayfs )"
591 -
592 -S=${WORKDIR}/${MY_P}
593 -
594 -src_prepare() {
595 - default
596 -
597 - # Disable installation of python modules here, since those are
598 - # installed by separate ebuilds.
599 - local makefile_sed_args=(
600 - -e '/^GIT_.*/d'
601 - -e 's/$(GO) build/$(GO) build -v -work -x/'
602 - -e 's/^\(install:.*\) install\.python$/\1/'
603 - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
604 - )
605 -
606 - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
607 -
608 - sed "${makefile_sed_args[@]}" -i Makefile || die
609 -
610 - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
611 - -i hack/get_release_info.sh || die
612 -}
613 -
614 -src_compile() {
615 - local git_commiT=${EGIT_COMMIT}
616 -
617 - # Filter unsupported linker flags
618 - filter-flags '-Wl,*'
619 -
620 - [[ -f hack/apparmor_tag.sh ]] || die
621 - if use apparmor; then
622 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
623 - else
624 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
625 - fi
626 -
627 - [[ -f hack/btrfs_installed_tag.sh ]] || die
628 - if use btrfs; then
629 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
630 - else
631 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
632 - hack/btrfs_installed_tag.sh || die
633 - fi
634 -
635 - [[ -f hack/selinux_tag.sh ]] || die
636 - if use selinux; then
637 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
638 - else
639 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
640 - fi
641 -
642 - # Avoid this error when generating pkg/varlink/iopodman.go:
643 - # cannot find package "github.com/varlink/go/varlink/idl"
644 - mkdir -p _output || die
645 - ln -snf ../vendor _output/src || die
646 - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
647 - rm _output/src || die
648 -
649 - export -n GOCACHE GOPATH XDG_CACHE_HOME
650 - GOBIN="${S}/bin" \
651 - emake all \
652 - GIT_BRANCH=master \
653 - GIT_BRANCH_CLEAN=master \
654 - COMMIT_NO="${git_commit}" \
655 - GIT_COMMIT="${git_commit}"
656 -}
657 -
658 -src_install() {
659 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
660 -
661 - insinto /etc/containers
662 - newins test/registries.conf registries.conf.example
663 - newins test/policy.json policy.json.example
664 -
665 - insinto /usr/share/containers
666 - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
667 -
668 - newconfd "${FILESDIR}"/podman.confd podman
669 - newinitd "${FILESDIR}"/podman.initd podman
670 -
671 - insinto /etc/logrotate.d
672 - newins "${FILESDIR}/podman.logrotated" podman
673 -
674 - dobashcomp completions/bash/*
675 -
676 - insinto /usr/share/zsh/site-functions
677 - doins completions/zsh/*
678 -
679 - insinto /usr/share/fish/vendor_completions.d
680 - doins completions/fish/*
681 -
682 - keepdir /var/lib/containers
683 -}
684 -
685 -pkg_preinst() {
686 - PODMAN_ROOTLESS_UPGRADE=false
687 - if use rootless; then
688 - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
689 - fi
690 -}
691 -
692 -pkg_postinst() {
693 - tmpfiles_process podman.conf
694 -
695 - local want_newline=false
696 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
697 - elog "You need to create the following config files:"
698 - elog "/etc/containers/registries.conf"
699 - elog "/etc/containers/policy.json"
700 - elog "To copy over default examples, use:"
701 - elog "cp /etc/containers/registries.conf{.example,}"
702 - elog "cp /etc/containers/policy.json{.example,}"
703 - want_newline=true
704 - fi
705 - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
706 - ${want_newline} && elog ""
707 - elog "For rootless operation, you need to configure subuid/subgid"
708 - elog "for user running podman. In case subuid/subgid has only been"
709 - elog "configured for root, run:"
710 - elog "usermod --add-subuids 1065536-1131071 <user>"
711 - elog "usermod --add-subgids 1065536-1131071 <user>"
712 - want_newline=true
713 - fi
714 -}