Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/
Date: Thu, 06 Jan 2022 08:17:58
Message-Id: 1641457045.59cacb65fb0cceda1dd7e1b742116f35b8987051.gyakovlev@gentoo
1 commit: 59cacb65fb0cceda1dd7e1b742116f35b8987051
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 6 08:15:53 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 08:17:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59cacb65
7
8 app-containers/containerd: drop 1.5.7
9
10 Bug: https://bugs.gentoo.org/830672
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 app-containers/containerd/Manifest | 1 -
14 app-containers/containerd/containerd-1.5.7.ebuild | 84 -----------------------
15 2 files changed, 85 deletions(-)
16
17 diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
18 index fd8badebb7dc..7681b38a8cb9 100644
19 --- a/app-containers/containerd/Manifest
20 +++ b/app-containers/containerd/Manifest
21 @@ -1,4 +1,3 @@
22 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
23 DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
24 -DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50 SHA512 ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0
25 DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
26
27 diff --git a/app-containers/containerd/containerd-1.5.7.ebuild b/app-containers/containerd/containerd-1.5.7.ebuild
28 deleted file mode 100644
29 index de23ad71b908..000000000000
30 --- a/app-containers/containerd/containerd-1.5.7.ebuild
31 +++ /dev/null
32 @@ -1,84 +0,0 @@
33 -# Copyright 2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -GIT_REVISION=8686ededfc90076914c5238eb96c883ea093a8ba
38 -inherit go-module systemd
39 -
40 -DESCRIPTION="A daemon to control runC"
41 -HOMEPAGE="https://containerd.io/"
42 -SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="Apache-2.0"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
47 -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
48 -
49 -DEPEND="
50 - btrfs? ( sys-fs/btrfs-progs )
51 - seccomp? ( sys-libs/libseccomp )
52 -"
53 -
54 -# recommended version of runc is found in script/setup/runc-version
55 -RDEPEND="
56 - ${DEPEND}
57 - ~app-containers/runc-1.0.2
58 -"
59 -
60 -BDEPEND="
61 - dev-go/go-md2man
62 - virtual/pkgconfig
63 -"
64 -
65 -# tests require root or docker
66 -# upstream does not recommend stripping binary
67 -RESTRICT+=" strip test"
68 -
69 -src_prepare() {
70 - default
71 - sed -i \
72 - -e "s/-s -w//" \
73 - Makefile || die
74 - sed -i \
75 - -e "s:/usr/local:/usr:" \
76 - containerd.service || die
77 -}
78 -
79 -src_compile() {
80 - local options=(
81 - $(usev apparmor)
82 - $(usex btrfs "" "no_btrfs")
83 - $(usex cri "" "no_cri")
84 - $(usex device-mapper "" "no_devmapper")
85 - $(usev seccomp)
86 - $(usev selinux)
87 - )
88 -
89 - myemakeargs=(
90 - BUILDTAGS="${options[*]}"
91 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
92 - REVISION="${GIT_REVISION}"
93 - VERSION=v${PV}
94 - )
95 -
96 - # race condition in man target https://bugs.gentoo.org/765100
97 - # we need to explicitly specify GOFLAGS for "go run" to use vendor source
98 - emake "${myemakeargs[@]}" man -j1 #nowarn
99 - emake "${myemakeargs[@]}" all
100 -
101 -}
102 -
103 -src_install() {
104 - dobin bin/*
105 - doman man/*
106 - newinitd "${FILESDIR}"/${PN}.initd "${PN}"
107 - systemd_dounit containerd.service
108 - keepdir /var/lib/containerd
109 -
110 - # we already installed manpages, remove markdown source
111 - # before installing docs directory
112 - rm -r docs/man || die
113 -
114 - local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
115 - einstalldocs
116 -}