gentoo resync : 25.11.2020

4 files changed, 7 insertions, 61 deletions

diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 630128ff3125..fa78653a6fe9 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,4 +1,3 @@
 DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
-EBUILD runc-1.0.0_rc10-r1.ebuild 1840 BLAKE2B 16f2f16898eef7fc8db2063e4256eb176ea4e62aaa909c98dd2f93a409598d858b8a36df811457d878111101922fd5cfa1d601e8f1986fd991222cb6f09af38c SHA512 1e11442f8aabb8484996cbd04bff23ff9aa62038bf62f4ec9cccafa652c84e6fa5fb50df5cdcefd5c2b95fe4b1170ff6f1004d36761b1d919955f58fc1e67376
-EBUILD runc-1.0.0_rc10.ebuild 1367 BLAKE2B 0f15ea756bb1a152e18ceb08cd4042a0fe1576d1e2e808858c47f0455f5a3620152922963c86faf8a1908baa4dd3962e572f0f1d3fba19f613512eae8f2d555c SHA512 1bee2f58c2438877dfc9119eaa739ead5d316ce86cc61ef7635bd44cf4f9780fcdd414e6a9b27c84f364199f9d7fdf078b72816af96dd0892ad3302b2e915e93
-MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b
+EBUILD runc-1.0.0_rc10-r1.ebuild 1837 BLAKE2B ffc28565f2daf8dbda38f643dfb2bd26596531a19b3087a17a3f59a9c535080ac93c530c21055716a5d4c36211a62e3aecce74ed385a0446bb47784bd49e8420 SHA512 cdceb2bf1583bdb678da403a3e47bd4cdcdf1af081889ca36da0bdf606e93d477950e1e8e58d51d7d36d78a4a7f482bdc49e677f106f53e8d4326fbc2e56b820
+MISC metadata.xml 876 BLAKE2B db5667a946ce043848f7cf87bcaa8c03594e9c4c35186fc905befd344202028742ab51a783751629086fc79cc3d6ee0d5b316978b2aa8677d6f47bd167fdca99 SHA512 0ad802b914d57523092f574450357bf90d54bce93d22e217061fce2817f68a43e5fd3402f80820c2b5e33ade763cb91ddb261250bfddf8ec4785e457981d69f0
diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
index 7cb4581ab75d..8b7ea39239c3 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@@ -9,6 +9,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="ambient">
 			Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later).
diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
index 71ec6fbe3a47..9f60bd86db13 100644
--- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${RUNC_COMMIT}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild
deleted file mode 100644
index 903314b0fd14..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-CONFIG_CHECK="~USER_NS"
-EGO_PN="github.com/opencontainers/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-build golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	# Change this when you update the ebuild
-	RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd
-	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-	inherit golang-build golang-vcs-snapshot
-fi
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-IUSE="+ambient apparmor hardened +kmem +seccomp"
-
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-	!app-emulation/docker-runc
-"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usex ambient 'ambient' '')
-		$(usex apparmor 'apparmor' '')
-		$(usex seccomp 'seccomp' '')
-		$(usex kmem '' 'nokmem')
-	)
-
-	COMMIT=${RUNC_COMMIT} GOPATH="${S}" emake BUILDTAGS="${options[*]}" \
-		-C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin runc
-	dodoc README.md PRINCIPLES.md
-	popd || die
-}