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