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: Sun, 19 Jan 2020 21:17:45
Message-Id: 1579468655.475d21af3f3093b8ab24bef98fea99c5f4f35d2f.zmedico@gentoo
1 commit: 475d21af3f3093b8ab24bef98fea99c5f4f35d2f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 19 21:17:11 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 19 21:17:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475d21af
7
8 app-emulation/libpod: Remove old version 1.6.3-r2
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/libpod/Manifest | 1 -
14 app-emulation/libpod/libpod-1.6.3-r2.ebuild | 142 ----------------------------
15 2 files changed, 143 deletions(-)
16
17 diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
18 index f5d984e4cde..b0d47445155 100644
19 --- a/app-emulation/libpod/Manifest
20 +++ b/app-emulation/libpod/Manifest
21 @@ -1,4 +1,3 @@
22 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
23 -DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd
24 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
25 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
26
27 diff --git a/app-emulation/libpod/libpod-1.6.3-r2.ebuild b/app-emulation/libpod/libpod-1.6.3-r2.ebuild
28 deleted file mode 100644
29 index 345becae929..00000000000
30 --- a/app-emulation/libpod/libpod-1.6.3-r2.ebuild
31 +++ /dev/null
32 @@ -1,142 +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="9d087f6a766259ba53b224944f1b7b778035c370"
39 -
40 -inherit bash-completion-r1 flag-o-matic go-module
41 -
42 -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
43 -HOMEPAGE="https://github.com/containers/libpod/"
44 -CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
45 -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
46 - https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
47 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
48 -SLOT="0"
49 -
50 -KEYWORDS="~amd64"
51 -IUSE="apparmor btrfs ostree +rootless selinux"
52 -REQUIRED_USE="!ostree"
53 -RESTRICT="test"
54 -
55 -COMMON_DEPEND="
56 - app-crypt/gpgme:=
57 - >=app-emulation/conmon-2.0.0
58 - || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
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 - rootless? ( app-emulation/slirp4netns )
67 - selinux? ( sys-libs/libselinux:= )
68 -"
69 -DEPEND="
70 - ${COMMON_DEPEND}
71 - dev-go/go-md2man"
72 -RDEPEND="${COMMON_DEPEND}"
73 -
74 -src_prepare() {
75 - default
76 - sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
77 - "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
78 - "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
79 - eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
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 - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
89 - -i hack/get_release_info.sh || die
90 -}
91 -
92 -src_compile() {
93 - # Filter unsupported linker flags
94 - filter-flags '-Wl,*'
95 -
96 - [[ -f hack/apparmor_tag.sh ]] || die
97 - if use apparmor; then
98 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
99 - else
100 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
101 - fi
102 -
103 - [[ -f hack/btrfs_installed_tag.sh ]] || die
104 - if use btrfs; then
105 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
106 - else
107 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
108 - hack/btrfs_installed_tag.sh || die
109 - fi
110 -
111 - [[ -f hack/selinux_tag.sh ]] || die
112 - if use selinux; then
113 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
114 - else
115 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
116 - fi
117 -
118 - export -n GOCACHE GOPATH XDG_CACHE_HOME
119 - GOBIN="${S}/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="${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 - insinto /usr/share/containers
135 - doins seccomp.json
136 -
137 - newinitd "${FILESDIR}"/podman.initd podman
138 -
139 - insinto /etc/logrotate.d
140 - newins "${FILESDIR}/podman.logrotated" podman
141 -
142 - dobashcomp completions/bash/*
143 -
144 - keepdir /var/lib/containers
145 -}
146 -
147 -pkg_preinst() {
148 - LIBPOD_ROOTLESS_UPGRADE=false
149 - if use rootless; then
150 - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
151 - fi
152 -}
153 -
154 -pkg_postinst() {
155 - local want_newline=false
156 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
157 - elog "You need to create the following config files:"
158 - elog "/etc/containers/registries.conf"
159 - elog "/etc/containers/policy.json"
160 - elog "To copy over default examples, use:"
161 - elog "cp /etc/containers/registries.conf{.example,}"
162 - elog "cp /etc/containers/policy.json{.example,}"
163 - want_newline=true
164 - fi
165 - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
166 - ${want_newline} && elog ""
167 - elog "For rootless operation, you need to configure subuid/subgid"
168 - elog "for user running podman. In case subuid/subgid has only been"
169 - elog "configured for root, run:"
170 - elog "usermod --add-subuids 1065536-1131071 <user>"
171 - elog "usermod --add-subgids 1065536-1131071 <user>"
172 - want_newline=true
173 - fi
174 -}