1 |
commit: 9ac200b5cc6bf6f33e8cf3b89192ecc4e1e1d1d9 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 9 05:12:53 2021 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 9 05:12:53 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac200b5 |
7 |
|
8 |
app-emulation/podman: Remove old versions |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
12 |
|
13 |
app-emulation/podman/Manifest | 2 - |
14 |
app-emulation/podman/podman-3.1.2-r1.ebuild | 164 ---------------------------- |
15 |
app-emulation/podman/podman-3.2.1-r1.ebuild | 164 ---------------------------- |
16 |
3 files changed, 330 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest |
19 |
index 49d6dd8ba29..6d43cfe945f 100644 |
20 |
--- a/app-emulation/podman/Manifest |
21 |
+++ b/app-emulation/podman/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST podman-3.1.2.tar.gz 10488539 BLAKE2B 8536f6856e436467541f7714e75d5055545e1514604d6541671894117e752609a9e791355c162ef8fcdbc0cbd992823ecab8a3ab760bab3a469d9768b6b008e4 SHA512 fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d |
24 |
-DIST podman-3.2.1.tar.gz 10754823 BLAKE2B 6c4e7292ba30969ef8632ad514a87650131a05baafab65d49fe182bddaa1b106de5766ec6677b73d0a2e5166c56f1439de6c800ca7de8ac59e026de1286bf2d4 SHA512 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4 |
25 |
DIST podman-3.3.1.tar.gz 10917305 BLAKE2B fe7856c2ad8893e40ec42fb242a088794ea18910388d5e8089885013cab45c98e03bef99a5e911749f95ce469518e6fa5b6d30400f52696645c9ba8c140ba445 SHA512 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa |
26 |
|
27 |
diff --git a/app-emulation/podman/podman-3.1.2-r1.ebuild b/app-emulation/podman/podman-3.1.2-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index ce8fb2e7471..00000000000 |
30 |
--- a/app-emulation/podman/podman-3.1.2-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,164 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
-EGIT_COMMIT="51b8ddbc22cf5b10dd76dd9243924aa66ad7db39" |
38 |
- |
39 |
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles |
40 |
- |
41 |
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" |
42 |
-HOMEPAGE="https://github.com/containers/podman/" |
43 |
-MY_PN=podman |
44 |
-MY_P=${MY_PN}-${PV} |
45 |
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" |
46 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
47 |
-SLOT="0" |
48 |
- |
49 |
-KEYWORDS="~amd64 ~arm64" |
50 |
-IUSE="apparmor btrfs +fuse +rootless selinux" |
51 |
-RESTRICT="test" |
52 |
- |
53 |
-COMMON_DEPEND=" |
54 |
- app-crypt/gpgme:= |
55 |
- >=app-emulation/conmon-2.0.0 |
56 |
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) |
57 |
- dev-libs/libassuan:= |
58 |
- dev-libs/libgpg-error:= |
59 |
- >=net-misc/cni-plugins-0.8.6 |
60 |
- sys-fs/lvm2 |
61 |
- sys-libs/libseccomp:= |
62 |
- |
63 |
- apparmor? ( sys-libs/libapparmor ) |
64 |
- btrfs? ( sys-fs/btrfs-progs ) |
65 |
- rootless? ( app-emulation/slirp4netns ) |
66 |
- selinux? ( sys-libs/libselinux:= ) |
67 |
-" |
68 |
-DEPEND=" |
69 |
- ${COMMON_DEPEND} |
70 |
- dev-go/go-md2man" |
71 |
-RDEPEND="${COMMON_DEPEND} |
72 |
- fuse? ( sys-fs/fuse-overlayfs )" |
73 |
- |
74 |
-S=${WORKDIR}/${MY_P} |
75 |
- |
76 |
-src_prepare() { |
77 |
- default |
78 |
- |
79 |
- # Disable installation of python modules here, since those are |
80 |
- # installed by separate ebuilds. |
81 |
- local makefile_sed_args=( |
82 |
- -e '/^GIT_.*/d' |
83 |
- -e 's/$(GO) build/$(GO) build -v -work -x/' |
84 |
- -e 's/^\(install:.*\) install\.python$/\1/' |
85 |
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|' |
86 |
- ) |
87 |
- |
88 |
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') |
89 |
- |
90 |
- sed "${makefile_sed_args[@]}" -i Makefile || die |
91 |
- |
92 |
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ |
93 |
- -i hack/get_release_info.sh || die |
94 |
-} |
95 |
- |
96 |
-src_compile() { |
97 |
- local git_commiT=${EGIT_COMMIT} |
98 |
- |
99 |
- # Filter unsupported linker flags |
100 |
- filter-flags '-Wl,*' |
101 |
- |
102 |
- [[ -f hack/apparmor_tag.sh ]] || die |
103 |
- if use apparmor; then |
104 |
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die |
105 |
- else |
106 |
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die |
107 |
- fi |
108 |
- |
109 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
110 |
- if use btrfs; then |
111 |
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die |
112 |
- else |
113 |
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
114 |
- hack/btrfs_installed_tag.sh || die |
115 |
- fi |
116 |
- |
117 |
- [[ -f hack/selinux_tag.sh ]] || die |
118 |
- if use selinux; then |
119 |
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die |
120 |
- else |
121 |
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die |
122 |
- fi |
123 |
- |
124 |
- # Avoid this error when generating pkg/varlink/iopodman.go: |
125 |
- # cannot find package "github.com/varlink/go/varlink/idl" |
126 |
- mkdir -p _output || die |
127 |
- ln -snf ../vendor _output/src || die |
128 |
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die |
129 |
- rm _output/src || die |
130 |
- |
131 |
- export -n GOCACHE GOPATH XDG_CACHE_HOME |
132 |
- GOBIN="${S}/bin" \ |
133 |
- emake all \ |
134 |
- GIT_BRANCH=master \ |
135 |
- GIT_BRANCH_CLEAN=master \ |
136 |
- COMMIT_NO="${git_commit}" \ |
137 |
- GIT_COMMIT="${git_commit}" |
138 |
-} |
139 |
- |
140 |
-src_install() { |
141 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
142 |
- |
143 |
- insinto /etc/containers |
144 |
- newins test/registries.conf registries.conf.example |
145 |
- newins test/policy.json policy.json.example |
146 |
- |
147 |
- insinto /usr/share/containers |
148 |
- doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json |
149 |
- |
150 |
- newconfd "${FILESDIR}"/podman.confd podman |
151 |
- newinitd "${FILESDIR}"/podman.initd podman |
152 |
- |
153 |
- insinto /etc/logrotate.d |
154 |
- newins "${FILESDIR}/podman.logrotated" podman |
155 |
- |
156 |
- dobashcomp completions/bash/* |
157 |
- |
158 |
- insinto /usr/share/zsh/site-functions |
159 |
- doins completions/zsh/* |
160 |
- |
161 |
- insinto /usr/share/fish/vendor_completions.d |
162 |
- doins completions/fish/* |
163 |
- |
164 |
- keepdir /var/lib/containers |
165 |
-} |
166 |
- |
167 |
-pkg_preinst() { |
168 |
- PODMAN_ROOTLESS_UPGRADE=false |
169 |
- if use rootless; then |
170 |
- has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true |
171 |
- fi |
172 |
-} |
173 |
- |
174 |
-pkg_postinst() { |
175 |
- tmpfiles_process podman.conf |
176 |
- |
177 |
- local want_newline=false |
178 |
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then |
179 |
- elog "You need to create the following config files:" |
180 |
- elog "/etc/containers/registries.conf" |
181 |
- elog "/etc/containers/policy.json" |
182 |
- elog "To copy over default examples, use:" |
183 |
- elog "cp /etc/containers/registries.conf{.example,}" |
184 |
- elog "cp /etc/containers/policy.json{.example,}" |
185 |
- want_newline=true |
186 |
- fi |
187 |
- if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then |
188 |
- ${want_newline} && elog "" |
189 |
- elog "For rootless operation, you need to configure subuid/subgid" |
190 |
- elog "for user running podman. In case subuid/subgid has only been" |
191 |
- elog "configured for root, run:" |
192 |
- elog "usermod --add-subuids 1065536-1131071 <user>" |
193 |
- elog "usermod --add-subgids 1065536-1131071 <user>" |
194 |
- want_newline=true |
195 |
- fi |
196 |
-} |
197 |
|
198 |
diff --git a/app-emulation/podman/podman-3.2.1-r1.ebuild b/app-emulation/podman/podman-3.2.1-r1.ebuild |
199 |
deleted file mode 100644 |
200 |
index 090d5367af6..00000000000 |
201 |
--- a/app-emulation/podman/podman-3.2.1-r1.ebuild |
202 |
+++ /dev/null |
203 |
@@ -1,164 +0,0 @@ |
204 |
-# Copyright 1999-2021 Gentoo Authors |
205 |
-# Distributed under the terms of the GNU General Public License v2 |
206 |
- |
207 |
-EAPI=7 |
208 |
-EGIT_COMMIT="152952fe6b18581615c3efd1fafef2d8142738e8" |
209 |
- |
210 |
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles |
211 |
- |
212 |
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" |
213 |
-HOMEPAGE="https://github.com/containers/podman/" |
214 |
-MY_PN=podman |
215 |
-MY_P=${MY_PN}-${PV} |
216 |
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" |
217 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
218 |
-SLOT="0" |
219 |
- |
220 |
-KEYWORDS="~amd64 ~arm64 ~ppc64" |
221 |
-IUSE="apparmor btrfs +fuse +rootless selinux" |
222 |
-RESTRICT="test" |
223 |
- |
224 |
-COMMON_DEPEND=" |
225 |
- app-crypt/gpgme:= |
226 |
- >=app-emulation/conmon-2.0.0 |
227 |
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) |
228 |
- dev-libs/libassuan:= |
229 |
- dev-libs/libgpg-error:= |
230 |
- >=net-misc/cni-plugins-0.8.6 |
231 |
- sys-fs/lvm2 |
232 |
- sys-libs/libseccomp:= |
233 |
- |
234 |
- apparmor? ( sys-libs/libapparmor ) |
235 |
- btrfs? ( sys-fs/btrfs-progs ) |
236 |
- rootless? ( app-emulation/slirp4netns ) |
237 |
- selinux? ( sys-libs/libselinux:= ) |
238 |
-" |
239 |
-DEPEND=" |
240 |
- ${COMMON_DEPEND} |
241 |
- dev-go/go-md2man" |
242 |
-RDEPEND="${COMMON_DEPEND} |
243 |
- fuse? ( sys-fs/fuse-overlayfs )" |
244 |
- |
245 |
-S=${WORKDIR}/${MY_P} |
246 |
- |
247 |
-src_prepare() { |
248 |
- default |
249 |
- |
250 |
- # Disable installation of python modules here, since those are |
251 |
- # installed by separate ebuilds. |
252 |
- local makefile_sed_args=( |
253 |
- -e '/^GIT_.*/d' |
254 |
- -e 's/$(GO) build/$(GO) build -v -work -x/' |
255 |
- -e 's/^\(install:.*\) install\.python$/\1/' |
256 |
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|' |
257 |
- ) |
258 |
- |
259 |
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') |
260 |
- |
261 |
- sed "${makefile_sed_args[@]}" -i Makefile || die |
262 |
- |
263 |
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ |
264 |
- -i hack/get_release_info.sh || die |
265 |
-} |
266 |
- |
267 |
-src_compile() { |
268 |
- local git_commiT=${EGIT_COMMIT} |
269 |
- |
270 |
- # Filter unsupported linker flags |
271 |
- filter-flags '-Wl,*' |
272 |
- |
273 |
- [[ -f hack/apparmor_tag.sh ]] || die |
274 |
- if use apparmor; then |
275 |
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die |
276 |
- else |
277 |
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die |
278 |
- fi |
279 |
- |
280 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
281 |
- if use btrfs; then |
282 |
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die |
283 |
- else |
284 |
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
285 |
- hack/btrfs_installed_tag.sh || die |
286 |
- fi |
287 |
- |
288 |
- [[ -f hack/selinux_tag.sh ]] || die |
289 |
- if use selinux; then |
290 |
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die |
291 |
- else |
292 |
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die |
293 |
- fi |
294 |
- |
295 |
- # Avoid this error when generating pkg/varlink/iopodman.go: |
296 |
- # cannot find package "github.com/varlink/go/varlink/idl" |
297 |
- mkdir -p _output || die |
298 |
- ln -snf ../vendor _output/src || die |
299 |
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die |
300 |
- rm _output/src || die |
301 |
- |
302 |
- export -n GOCACHE GOPATH XDG_CACHE_HOME |
303 |
- GOBIN="${S}/bin" \ |
304 |
- emake all \ |
305 |
- GIT_BRANCH=master \ |
306 |
- GIT_BRANCH_CLEAN=master \ |
307 |
- COMMIT_NO="${git_commit}" \ |
308 |
- GIT_COMMIT="${git_commit}" |
309 |
-} |
310 |
- |
311 |
-src_install() { |
312 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
313 |
- |
314 |
- insinto /etc/containers |
315 |
- newins test/registries.conf registries.conf.example |
316 |
- newins test/policy.json policy.json.example |
317 |
- |
318 |
- insinto /usr/share/containers |
319 |
- doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json |
320 |
- |
321 |
- newconfd "${FILESDIR}"/podman.confd podman |
322 |
- newinitd "${FILESDIR}"/podman.initd podman |
323 |
- |
324 |
- insinto /etc/logrotate.d |
325 |
- newins "${FILESDIR}/podman.logrotated" podman |
326 |
- |
327 |
- dobashcomp completions/bash/* |
328 |
- |
329 |
- insinto /usr/share/zsh/site-functions |
330 |
- doins completions/zsh/* |
331 |
- |
332 |
- insinto /usr/share/fish/vendor_completions.d |
333 |
- doins completions/fish/* |
334 |
- |
335 |
- keepdir /var/lib/containers |
336 |
-} |
337 |
- |
338 |
-pkg_preinst() { |
339 |
- PODMAN_ROOTLESS_UPGRADE=false |
340 |
- if use rootless; then |
341 |
- has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true |
342 |
- fi |
343 |
-} |
344 |
- |
345 |
-pkg_postinst() { |
346 |
- tmpfiles_process podman.conf |
347 |
- |
348 |
- local want_newline=false |
349 |
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then |
350 |
- elog "You need to create the following config files:" |
351 |
- elog "/etc/containers/registries.conf" |
352 |
- elog "/etc/containers/policy.json" |
353 |
- elog "To copy over default examples, use:" |
354 |
- elog "cp /etc/containers/registries.conf{.example,}" |
355 |
- elog "cp /etc/containers/policy.json{.example,}" |
356 |
- want_newline=true |
357 |
- fi |
358 |
- if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then |
359 |
- ${want_newline} && elog "" |
360 |
- elog "For rootless operation, you need to configure subuid/subgid" |
361 |
- elog "for user running podman. In case subuid/subgid has only been" |
362 |
- elog "configured for root, run:" |
363 |
- elog "usermod --add-subuids 1065536-1131071 <user>" |
364 |
- elog "usermod --add-subgids 1065536-1131071 <user>" |
365 |
- want_newline=true |
366 |
- fi |
367 |
-} |