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 EA035158086 for ; Wed, 6 Oct 2021 16:49:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39B3AE09B1; Wed, 6 Oct 2021 16:49:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06BE1E099C for ; Wed, 6 Oct 2021 16:49:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FA033432B0 for ; Wed, 6 Oct 2021 16:49:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBFCB12F for ; Wed, 6 Oct 2021 16:49:52 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1633538984.034053ac638abda13af6c8b4fe9fce45bd1023ed.williamh@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.4.8.ebuild X-VCS-Directories: app-emulation/containerd/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 034053ac638abda13af6c8b4fe9fce45bd1023ed X-VCS-Branch: master Date: Wed, 6 Oct 2021 16:49:52 +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: 09193550-9a1e-42ae-83e2-2bf724dafd84 X-Archives-Hash: a67f606054e0f86f667854bdb86bd398 commit: 034053ac638abda13af6c8b4fe9fce45bd1023ed Author: William Hubbs gentoo org> AuthorDate: Wed Oct 6 16:49:18 2021 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Oct 6 16:49:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034053ac app-emulation/containerd: remove old Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: William Hubbs gentoo.org> app-emulation/containerd/Manifest | 1 - app-emulation/containerd/containerd-1.4.8.ebuild | 84 ------------------------ 2 files changed, 85 deletions(-) diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 41853b67f9c..82b2c36efe5 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,4 +1,3 @@ DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070 -DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50 SHA512 ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0 diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild b/app-emulation/containerd/containerd-1.4.8.ebuild deleted file mode 100644 index 9e30a14ae4d..00000000000 --- a/app-emulation/containerd/containerd-1.4.8.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2 -EGO_PN="github.com/containerd/${PN}" -inherit golang-vcs-snapshot 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" - -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 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig - test? ( ${RDEPEND} ) -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ - -e "s/-s -w//" \ - Makefile || 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' '')" - ) - - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - export GOFLAGS="-v -x -mod=vendor" - # race condition in man target https://bugs.gentoo.org/765100 - emake "${myemakeargs[@]}" man -j1 #nowarn - emake "${myemakeargs[@]}" all -} - -src_install() { - dobin bin/* - doman man/* - newinitd "${FILESDIR}"/${PN}.initd "${PN}" - keepdir /var/lib/containerd - - # we already installed manpages, remove markdown source - # before installing docs directory - rm -r docs/man || die - - local DOCS=( README.md PLUGINS.md docs/. ) - einstalldocs -}