gentoo resync : 15.06.2021

5 files changed, 4 insertions, 171 deletions

diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index a26f039def69..5ffaa9be9895 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,7 +1,3 @@
-DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
-DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40
-DIST runc-1.0.0_rc93.tar.gz 2132429 BLAKE2B 35d6fe9eebd26fb37d648a67b35415c51283ac3dff0f111e88be9120cf139e4811ab9a7b98e2c559dc4ce8b0e7958f15464dc4f039f7b3eb9f06f26a1776875f SHA512 087becdf3882818b7c8d05ac0192928695b35033d72e5ce584d5b8291310f4ba35b1cc78299fc8f17dc7ee425a94817b989890f4108444cc3c45927740b2d378
-EBUILD runc-1.0.0_rc10-r1.ebuild 1877 BLAKE2B 770d1f1010886fd3d3bc5cef6e52dce7b73dd44971d34ab0b421b8ed1995182fd360b412257b2c28556ee6b7dea9bffcd05fafee1e0e06502580405276ca28c8 SHA512 68c40ecace94901438662468e4f6bb1c33f63ed7382e579e764cfe21241fb49b8bac335ec57eacabf95623fe1185fb6512e70678a98f9ced5a3f917cab4d4882
-EBUILD runc-1.0.0_rc92.ebuild 1815 BLAKE2B 7ff8d0c518fc735e3529ceefb5a963fe93025c403babaae144434c3662866c5ddaf60a3cf5b0e4b3cfc534a4c5dad5ab06d9c790c95667fd7e5705b1f9c169d2 SHA512 23324b45ab77036f4a6951951e6e5639c8465ad4b589d46ca49854c1f05fb586366b5b5d857bd00f5c9a5f46c09d14c7a1eea8fe0ab540bbd1ba681f7b0bbaf6
-EBUILD runc-1.0.0_rc93.ebuild 1764 BLAKE2B 3f9c71b441c120e4b10989c8d32a92ee9e3ebda927a4ee7bd553f78d05ddcfa225e1603bd6190640ac7ac40d0c75b7ed7c3b22fc599679888692f416d8f25c28 SHA512 56d5dfcfb84a0c2983d7401566e35b1d53222fa754081d575fcc0ebe49ce9458f094ec3de4eabb8f51ac297546d450622198320ad39c7d2c71480bf6e1a65aaf
-MISC metadata.xml 940 BLAKE2B deaf72fbb5341bc95ab446cefeff9fdc870dfa87df4364132b862f7a699b5028f54a9d8852bf75bad0e229429cc6d22eb0c75f6bfa3ea4b1c4514cf5d0fcae3a SHA512 f24b8b3d59a534ff1991dfef51655c9e7a93f6c4f4cdb4a85d52ad69bdf17d68ee519d703a15941098cc90ce46643db48a0b398f8524cb80a9a7b2030ca20dc0
+DIST runc-1.0.0_rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+EBUILD runc-1.0.0_rc95.ebuild 1761 BLAKE2B 68ac242be9ab60d62b86e6ef9ca26838716697aa30a39dddc008035081bbab704d5a7b0c81a4adb1c3a04728efe9dbc58c664e35af6952c3be8cdb45d9369740 SHA512 70ed74518c4f115007f7cdbcaed871edede44bbcf87f5676e8eb29c10c4ea8b77a00eb23a09c0e7e30560d672a72030e417cb8f8a6b790c5c6dc145aeb0b4f89
+MISC metadata.xml 821 BLAKE2B eb8ae2aafcc540623838afc1ecdb8bab0b60ca1d836dcb4e0ee247219301f6c68e1f25430898f9533b71a5e23ea6c97fe2bad9ab1e375e0488c3084b51437b97 SHA512 15a4ac8303dd81200f74dc8d508fed2997ccb87b3fa5e61757025d0e659422713a6b6eadc00544ccadc902a4b56bc5312c156e75cd098711e240a1ed789c3360
diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
index f9c14aa5bb8d..8d7e000ad342 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@@ -14,9 +14,6 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
-		<flag name="ambient">
-			Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later).
-		</flag>
 		<flag name="apparmor">
 			Enable AppArmor support.
 		</flag>
diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
deleted file mode 100644
index 0a433baafd1e..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT="dc9208a3303feef5b3839f4323d9beb36df0a9dd"
-CONFIG_CHECK="~USER_NS"
-EGO_PN="github.com/opencontainers/${PN}"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev ambient)
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usev selinux)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT=${RUNC_COMMIT}
-		GOPATH="${S}"
-		-C "src/${EGO_PN}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild
deleted file mode 100644
index ec75ad824e47..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc92.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev ambient)
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usev selinux)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc95.ebuild
index 316f720fc29c..2fc5c14728ea 100644
--- a/app-emulation/runc/runc-1.0.0_rc93.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc95.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor hardened +kmem +seccomp test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"