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: Sat, 01 Jun 2019 06:10:37
Message-Id: 1559369391.bbc628ff2d2b878966df78fa0b4376b291e2cf32.zmedico@gentoo
1 commit: bbc628ff2d2b878966df78fa0b4376b291e2cf32
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 1 06:09:51 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 1 06:09:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc628ff
7
8 app-emulation/libpod: remove old versions
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/libpod/Manifest | 2 -
14 app-emulation/libpod/libpod-1.1.2.ebuild | 139 -------------------------------
15 app-emulation/libpod/libpod-1.2.0.ebuild | 139 -------------------------------
16 3 files changed, 280 deletions(-)
17
18 diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
19 index 066e117c70a..5f41cc0145c 100644
20 --- a/app-emulation/libpod/Manifest
21 +++ b/app-emulation/libpod/Manifest
22 @@ -1,3 +1 @@
23 -DIST libpod-1.1.2.tar.gz 7878228 BLAKE2B 8974949843c6f966d48715df320e47b814e442e374e1393dd5a116c6f7222e9ce29f480205f6a58e213e6cead58e5b4f31fd776865911b22e517607349654d35 SHA512 55456fe03da0873d3f6c67ced25dbe98f6a5a14c3da64ab2b4a9c6161c1d727ec8cdfe5414b534531e440e8c86f909449f4026d66898b909924aba1744ec0682
24 -DIST libpod-1.2.0.tar.gz 7978520 BLAKE2B c1be831553ced9795de266886890c36e89f2b6c2012cbe4f36fa49194c3a825abc097af879326e8e1ad7886ea188d60c42fe1dfa1ad46057c5928f3b5c4f7cd4 SHA512 16ae8fa8a6e9a15d17f7aebe0842bf41e289cbbe5ea8e997c26b2d3e984d669386022e7d1479ca31e8cab8990ae4e2dc1cf753f010bf9aeb03a34199b1146e89
25 DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b
26
27 diff --git a/app-emulation/libpod/libpod-1.1.2.ebuild b/app-emulation/libpod/libpod-1.1.2.ebuild
28 deleted file mode 100644
29 index 0d80616d4c5..00000000000
30 --- a/app-emulation/libpod/libpod-1.1.2.ebuild
31 +++ /dev/null
32 @@ -1,139 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -EGIT_COMMIT="0ad9b6bf2aea4ba37e8c9738feabec61343ba175"
39 -EGO_PN="github.com/containers/${PN}"
40 -
41 -inherit golang-vcs-snapshot systemd
42 -
43 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
44 -HOMEPAGE="https://github.com/containers/libpod/"
45 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
46 -LICENSE="Apache-2.0"
47 -SLOT="0"
48 -
49 -KEYWORDS="~amd64"
50 -IUSE="apparmor btrfs ostree +rootless selinux"
51 -REQUIRED_USE="!selinux? ( !ostree )"
52 -RESTRICT="test"
53 -
54 -COMMON_DEPEND="
55 - app-crypt/gpgme:=
56 - >=app-emulation/cri-o-1.13.0
57 - >=app-emulation/runc-1.0.0_rc6
58 - dev-libs/libassuan:=
59 - dev-libs/libgpg-error:=
60 - sys-fs/lvm2
61 - sys-libs/libseccomp:=
62 -
63 - apparmor? ( sys-libs/libapparmor )
64 - btrfs? ( sys-fs/btrfs-progs )
65 - ostree? (
66 - dev-libs/glib:=
67 - dev-util/ostree:=
68 - )
69 - rootless? ( app-emulation/slirp4netns )
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 GOCACHE -u LDFLAGS -u XDG_CACHE_HOME 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 - newins test/policy.json policy.json.example
133 -
134 - newinitd "${FILESDIR}"/podman.initd podman
135 -
136 - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
137 -
138 - insinto /etc/logrotate.d
139 - newins "${FILESDIR}/podman.logrotated" podman
140 -
141 - keepdir /var/lib/containers
142 -}
143 -
144 -pkg_preinst() {
145 - LIBPOD_ROOTLESS_UPGRADE=false
146 - if use rootless; then
147 - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
148 - fi
149 -}
150 -
151 -pkg_postinst() {
152 - local want_newline=false
153 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
154 - elog "You need to create the following config files:"
155 - elog "/etc/containers/registries.conf"
156 - elog "/etc/containers/policy.json"
157 - elog "To copy over default examples, use:"
158 - elog "cp /etc/containers/registries.conf{.example,}"
159 - elog "cp /etc/containers/policy.json{.example,}"
160 - want_newline=true
161 - fi
162 - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
163 - ${want_newline} && elog ""
164 - elog "For rootless operation, you need to configure subuid/subgid"
165 - elog "for user running podman. In case subuid/subgid has only been"
166 - elog "configured for root, run:"
167 - elog "usermod --add-subuids 1065536-1131071 <user>"
168 - elog "usermod --add-subgids 1065536-1131071 <user>"
169 - want_newline=true
170 - fi
171 -}
172
173 diff --git a/app-emulation/libpod/libpod-1.2.0.ebuild b/app-emulation/libpod/libpod-1.2.0.ebuild
174 deleted file mode 100644
175 index 526d4b90cde..00000000000
176 --- a/app-emulation/libpod/libpod-1.2.0.ebuild
177 +++ /dev/null
178 @@ -1,139 +0,0 @@
179 -# Copyright 1999-2019 Gentoo Authors
180 -# Distributed under the terms of the GNU General Public License v2
181 -
182 -EAPI=7
183 -
184 -EGIT_COMMIT="3bd528e583182b4249f3e6bbd8497a8831d89950"
185 -EGO_PN="github.com/containers/${PN}"
186 -
187 -inherit golang-vcs-snapshot systemd
188 -
189 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
190 -HOMEPAGE="https://github.com/containers/libpod/"
191 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
192 -LICENSE="Apache-2.0"
193 -SLOT="0"
194 -
195 -KEYWORDS="~amd64"
196 -IUSE="apparmor btrfs ostree +rootless selinux"
197 -REQUIRED_USE="!selinux? ( !ostree )"
198 -RESTRICT="test"
199 -
200 -COMMON_DEPEND="
201 - app-crypt/gpgme:=
202 - >=app-emulation/cri-o-1.13.0
203 - >=app-emulation/runc-1.0.0_rc6
204 - dev-libs/libassuan:=
205 - dev-libs/libgpg-error:=
206 - sys-fs/lvm2
207 - sys-libs/libseccomp:=
208 -
209 - apparmor? ( sys-libs/libapparmor )
210 - btrfs? ( sys-fs/btrfs-progs )
211 - ostree? (
212 - dev-libs/glib:=
213 - dev-util/ostree:=
214 - )
215 - rootless? ( app-emulation/slirp4netns )
216 - selinux? ( sys-libs/libselinux:= )
217 -"
218 -DEPEND="
219 - ${COMMON_DEPEND}
220 - dev-go/go-md2man"
221 -RDEPEND="${COMMON_DEPEND}"
222 -S="${WORKDIR}/${P}/src/${EGO_PN}"
223 -
224 -src_prepare() {
225 - default
226 -
227 - # Disable installation of python modules here, since those are
228 - # installed by separate ebuilds.
229 - sed -e '/^GIT_.*/d' \
230 - -e 's/$(GO) build/$(GO) build -v -work -x/' \
231 - -e 's/^\(install:.*\) install\.python$/\1/' \
232 - -i Makefile || die
233 -}
234 -
235 -src_compile() {
236 - [[ -f hack/apparmor_tag.sh ]] || die
237 - if use apparmor; then
238 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
239 - else
240 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
241 - fi
242 -
243 - [[ -f hack/btrfs_installed_tag.sh ]] || die
244 - if use btrfs; then
245 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
246 - else
247 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
248 - hack/btrfs_installed_tag.sh || die
249 - fi
250 -
251 - [[ -f hack/ostree_tag.sh ]] || die
252 - if use ostree; then
253 - echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
254 - else
255 - echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
256 - fi
257 -
258 - [[ -f hack/selinux_tag.sh ]] || die
259 - if use selinux; then
260 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
261 - else
262 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
263 - fi
264 -
265 - env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
266 - emake all \
267 - GIT_BRANCH=master \
268 - GIT_BRANCH_CLEAN=master \
269 - COMMIT_NO="${EGIT_COMMIT}" \
270 - GIT_COMMIT="${EGIT_COMMIT}"
271 -}
272 -
273 -src_install() {
274 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
275 -
276 - insinto /etc/containers
277 - newins test/registries.conf registries.conf.example
278 - newins test/policy.json policy.json.example
279 -
280 - newinitd "${FILESDIR}"/podman.initd podman
281 -
282 - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
283 -
284 - insinto /etc/logrotate.d
285 - newins "${FILESDIR}/podman.logrotated" podman
286 -
287 - keepdir /var/lib/containers
288 -}
289 -
290 -pkg_preinst() {
291 - LIBPOD_ROOTLESS_UPGRADE=false
292 - if use rootless; then
293 - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
294 - fi
295 -}
296 -
297 -pkg_postinst() {
298 - local want_newline=false
299 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
300 - elog "You need to create the following config files:"
301 - elog "/etc/containers/registries.conf"
302 - elog "/etc/containers/policy.json"
303 - elog "To copy over default examples, use:"
304 - elog "cp /etc/containers/registries.conf{.example,}"
305 - elog "cp /etc/containers/policy.json{.example,}"
306 - want_newline=true
307 - fi
308 - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
309 - ${want_newline} && elog ""
310 - elog "For rootless operation, you need to configure subuid/subgid"
311 - elog "for user running podman. In case subuid/subgid has only been"
312 - elog "configured for root, run:"
313 - elog "usermod --add-subuids 1065536-1131071 <user>"
314 - elog "usermod --add-subgids 1065536-1131071 <user>"
315 - want_newline=true
316 - fi
317 -}