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: Wed, 06 Oct 2021 17:24:19
Message-Id: 1633541042.a2ad3315d3835f669cc4430a382d00b3724e5e89.williamh@gentoo
1 commit: a2ad3315d3835f669cc4430a382d00b3724e5e89
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 6 17:21:55 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 6 17:24:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ad3315
7
8 app-emulation/containerd: remove unstable version
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 app-emulation/containerd/Manifest | 1 -
14 app-emulation/containerd/containerd-1.5.4.ebuild | 84 ------------------------
15 2 files changed, 85 deletions(-)
16
17 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
18 index 82b2c36efe5..4cb47a486a9 100644
19 --- a/app-emulation/containerd/Manifest
20 +++ b/app-emulation/containerd/Manifest
21 @@ -1,3 +1,2 @@
22 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
23 -DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
24 DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50 SHA512 ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0
25
26 diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild b/app-emulation/containerd/containerd-1.5.4.ebuild
27 deleted file mode 100644
28 index 5c02912623d..00000000000
29 --- a/app-emulation/containerd/containerd-1.5.4.ebuild
30 +++ /dev/null
31 @@ -1,84 +0,0 @@
32 -# Copyright 2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -inherit go-module systemd toolchain-funcs
37 -
38 -DESCRIPTION="A daemon to control runC"
39 -HOMEPAGE="https://containerd.io/"
40 -SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
41 -
42 -LICENSE="Apache-2.0"
43 -SLOT="0"
44 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
45 -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
46 -
47 -DEPEND="
48 - btrfs? ( sys-fs/btrfs-progs )
49 - seccomp? ( sys-libs/libseccomp )
50 -"
51 -
52 -# recommended version of runc is found in script/setup/runc-version
53 -RDEPEND="
54 - ${DEPEND}
55 - ~app-emulation/runc-1.0.0
56 -"
57 -
58 -BDEPEND="
59 - dev-go/go-md2man
60 - virtual/pkgconfig
61 -"
62 -
63 -# tests require root or docker
64 -# upstream does not recommend stripping binary
65 -RESTRICT+=" strip test"
66 -
67 -src_prepare() {
68 - default
69 - sed -i \
70 - -e "s/-s -w//" \
71 - Makefile || die
72 - sed -i \
73 - -e "s:/usr/local:/usr:" \
74 - containerd.service || die
75 -}
76 -
77 -src_compile() {
78 - local options=(
79 - $(usev apparmor)
80 - $(usex btrfs "" "no_btrfs")
81 - $(usex cri "" "no_cri")
82 - $(usex device-mapper "" "no_devmapper")
83 - $(usev seccomp)
84 - $(usev selinux)
85 - )
86 -
87 - myemakeargs=(
88 - BUILDTAGS="${options[*]}"
89 - GO_BUILD_FLAGS="-mod vendor"
90 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
91 - REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483
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 - GOFLAGS="-v -x -mod=vendor" 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 -}