Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/
Date: Thu, 10 Jun 2021 21:53:32
Message-Id: 1623361994.42f615190bbf77c8186ea9e7731b83e2a85fd6bb.williamh@gentoo
1 commit: 42f615190bbf77c8186ea9e7731b83e2a85fd6bb
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 10 21:53:14 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 21:53:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f61519
7
8 app-emulation/containerd: 1.4.6 bump
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 app-emulation/containerd/Manifest | 1 +
14 app-emulation/containerd/containerd-1.4.6.ebuild | 83 ++++++++++++++++++++++++
15 2 files changed, 84 insertions(+)
16
17 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
18 index 494937361e7..463c79f6453 100644
19 --- a/app-emulation/containerd/Manifest
20 +++ b/app-emulation/containerd/Manifest
21 @@ -1,3 +1,4 @@
22 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
23 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
24 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
25 +DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
26
27 diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
28 new file mode 100644
29 index 00000000000..136f9943ac0
30 --- /dev/null
31 +++ b/app-emulation/containerd/containerd-1.4.6.ebuild
32 @@ -0,0 +1,83 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
39 +EGO_PN="github.com/containerd/${PN}"
40 +inherit golang-vcs-snapshot toolchain-funcs
41 +
42 +DESCRIPTION="A daemon to control runC"
43 +HOMEPAGE="https://containerd.io/"
44 +SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 +
46 +LICENSE="Apache-2.0"
47 +SLOT="0"
48 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
49 +IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
50 +
51 +DEPEND="
52 + btrfs? ( sys-fs/btrfs-progs )
53 + seccomp? ( sys-libs/libseccomp )
54 +"
55 +
56 +RDEPEND="
57 + ${DEPEND}
58 + ~app-emulation/runc-1.0.0_rc95
59 +"
60 +
61 +BDEPEND="
62 + dev-go/go-md2man
63 + virtual/pkgconfig
64 + test? ( ${RDEPEND} )
65 +"
66 +
67 +# tests require root or docker
68 +# upstream does not recommend stripping binary
69 +RESTRICT+=" strip test"
70 +
71 +S="${WORKDIR}/${P}/src/${EGO_PN}"
72 +
73 +src_prepare() {
74 + default
75 + sed -i -e "s/git describe --match.*$/echo ${PV})/"\
76 + -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
77 + -e "s/-s -w//" \
78 + Makefile || die
79 +}
80 +
81 +src_compile() {
82 + local options=(
83 + $(usev apparmor)
84 + $(usex btrfs "" "no_btrfs")
85 + $(usex cri "" "no_cri")
86 + $(usex device-mapper "" "no_devmapper")
87 + $(usev seccomp)
88 + $(usev selinux)
89 + )
90 +
91 + myemakeargs=(
92 + BUILDTAGS="${options[*]}"
93 + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
94 + )
95 +
96 + export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
97 + export GOFLAGS="-v -x -mod=vendor"
98 + # race condition in man target https://bugs.gentoo.org/765100
99 + emake "${myemakeargs[@]}" man -j1 #nowarn
100 + emake "${myemakeargs[@]}" all
101 +}
102 +
103 +src_install() {
104 + dobin bin/*
105 + doman man/*
106 + newinitd "${FILESDIR}"/${PN}.initd "${PN}"
107 + keepdir /var/lib/containerd
108 +
109 + # we already installed manpages, remove markdown source
110 + # before installing docs directory
111 + rm -r docs/man || die
112 +
113 + local DOCS=( README.md PLUGINS.md docs/. )
114 + einstalldocs
115 +}