commit:     2b246f7bb16b795a81c62d339970813a7c77c834
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 18:14:17 2025 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 29 18:17:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b246f7b

app-containers/containerd: add 2.1.1

Closes: https://github.com/gentoo/gentoo/pull/42186
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/containerd/Manifest                |  1 +
 app-containers/containerd/containerd-2.1.1.ebuild | 95 +++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/app-containers/containerd/Manifest 
b/app-containers/containerd/Manifest
index e1df916ca557..58d587745885 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -3,3 +3,4 @@ DIST containerd-2.0.3.tar.gz 10450757 BLAKE2B 
5dec56a40dc2874fb0b6fd4d72704f6417
 DIST containerd-2.0.4.tar.gz 10450939 BLAKE2B 
f82ed40eab0f1d186f4fb04217b8f75a9da8e33b1140c0b5866dcc61e17fe1040f31ef09bdb07ad98a52def5e9eb12cfeb635e96b2c5f64fdb4d8cfb6c84b885
 SHA512 
f84e0cc0b82313df010b95989faf56e81ebfbbc321585b968c8c706917b91a9f0d895692fa5046f24f1c370de7a74b50daf83da617fe0595e5a8ff69ed658727
 DIST containerd-2.0.5.tar.gz 10452563 BLAKE2B 
bf03316c9211eaa17a3b40b1fc9f9aca42fe3e621e086e612eb07c286c6b62bc7a0a2426ce7b6742dce2924d570ab599aefb43463c4fa6be277e562bad79668f
 SHA512 
af89a5c9ad5f931c5fee33c75c13c296fc9ec966f2c64ec244897695eebb365bcb542f6b431e60d4ef7213f0ea11d3a8896d1b7f033ed445e6b521b7ddbffe6f
 DIST containerd-2.1.0.tar.gz 10610618 BLAKE2B 
147c21b4650543af9b0e533e381a0505ba927d6e9270b9b03a09016eb3ccf29875db7fa274944fea2ff7b029b6a05a17d14c61e24b5f3426b31f320831eeb46a
 SHA512 
e9bb128917bb6b2e21a8e05344af3fdcdda8620be20e54407bc2c73046278a88a77bcbed6ef7a59099c9ee3303283db46b90b71afdd45236d3c534749ba844e0
+DIST containerd-2.1.1.tar.gz 10610787 BLAKE2B 
acc2d769752c783643795d228c0d267b0802e09166dc783e84087da0029a822a64688f5e59c047c47b25f50ca2a1ccb7f5b6216ad6beeb4489df308e525e9716
 SHA512 
542f7cae61e1ef2e1b529b0bea66d7ad9016d4605de73de9c9c8a738e50ec6f470b939d1546482320515b77424bffe1cf24b721173ac0c0ecd0100c92817cfb1

diff --git a/app-containers/containerd/containerd-2.1.1.ebuild 
b/app-containers/containerd/containerd-2.1.1.ebuild
new file mode 100644
index 000000000000..c697a6ff2bc4
--- /dev/null
+++ b/app-containers/containerd/containerd-2.1.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-env go-module systemd toolchain-funcs
+GIT_REVISION=cb1076646aa3740577fafbf3d914198b7fe8e3f7
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/";
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+COMMON_DEPEND="
+       btrfs? ( sys-fs/btrfs-progs )
+       seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="
+${COMMON_DEPEND}
+"
+
+# recommended minimum version of runc is found in script/setup/runc-version
+RDEPEND="
+       ${COMMON_DEPEND}
+       >=app-containers/runc-1.3.0[apparmor?,seccomp?]
+"
+
+BDEPEND="
+       dev-go/go-md2man
+       virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+       default
+       sed -i \
+               -e "s/-s -w//" \
+               -e "s/-mod=readonly//" \
+               Makefile || die
+       sed -i \
+               -e "s:/usr/local:/usr:" \
+               containerd.service || die
+}
+
+src_compile() {
+       local options=(
+               $(usev apparmor)
+               $(usex btrfs "" "no_btrfs")
+               $(usex cri "" "no_cri")
+               $(usex device-mapper "" "no_devmapper")
+               $(usev seccomp)
+               $(usev selinux)
+       )
+
+       myemakeargs=(
+               BUILDTAGS="${options[*]}"
+               LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+               REVISION="${GIT_REVISION}"
+               VERSION=v${PV}
+       )
+
+       # The Go env is already set, but reset it for CBUILD in a subshell to 
allow
+       # building the man pages when cross-compiling.
+       (
+               CHOST="${CBUILD}" go-env_set_compile_environment
+               # race condition in man target https://bugs.gentoo.org/765100
+               tc-env_build emake "${myemakeargs[@]}" man -j1 #nowarn
+       )
+
+       emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+       rm bin/gen-manpages || die
+       dobin bin/*
+       doman man/*
+       newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+       newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+       systemd_dounit containerd.service
+       keepdir /var/lib/containerd
+
+       # we already installed manpages, remove markdown source
+       # before installing docs directory
+       rm -r docs/man || die
+
+       local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
+       einstalldocs
+}

Reply via email to