From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA797139337 for ; Mon, 26 Jul 2021 21:25:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03C42E08FA; Mon, 26 Jul 2021 21:25:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9A56E08FA for ; Mon, 26 Jul 2021 21:25:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B86C7342A89 for ; Mon, 26 Jul 2021 21:25:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFADA581 for ; Mon, 26 Jul 2021 21:25:09 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1627334680.62af75d4a618ab35ca0d6d9ef057535f86f0ce0c.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/containerd/Manifest app-emulation/containerd/containerd-1.5.2.ebuild X-VCS-Directories: app-emulation/containerd/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 62af75d4a618ab35ca0d6d9ef057535f86f0ce0c X-VCS-Branch: master Date: Mon, 26 Jul 2021 21:25:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e8109b43-a36e-4466-844c-e962ba15ba13 X-Archives-Hash: 0f5be0f8a5ac936d5159a11c0d0a08f5 commit: 62af75d4a618ab35ca0d6d9ef057535f86f0ce0c Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Jul 26 21:23:54 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jul 26 21:24:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62af75d4 app-emulation/containerd: drop 1.5.2 Bug: https://bugs.gentoo.org/802948 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/containerd/Manifest | 2 - app-emulation/containerd/containerd-1.5.2.ebuild | 82 ------------------------ 2 files changed, 84 deletions(-) diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 99e74a98cf1..53d555771a6 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,5 +1,3 @@ DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b -DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 -DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84 diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild deleted file mode 100644 index 7ebc5b20374..00000000000 --- a/app-emulation/containerd/containerd-1.5.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd toolchain-funcs - -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 - https://dev.gentoo.org/~williamh/dist/${PN}-man-${PV}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" - -DEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp ) -" - -# recommended version of runc is found in script/setup/runc-version -RDEPEND=" - ${DEPEND} - ~app-emulation/runc-1.0.0_rc95 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -src_prepare() { - default - mv ../man . || die - sed -i \ - -e "s/-s -w//" \ - 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[*]}" - GO_BUILD_FLAGS="-mod vendor" - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a - VERSION=v${PV} - ) - - emake "${myemakeargs[@]}" all -} - -src_install() { - dobin bin/* - doman man/* - 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 -}