gentoo resync : 24.12.2018

4 files changed, 70 insertions, 4 deletions

diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 8ce825e18868..0dd2b4d524b5 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,6 +1,8 @@
 DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 DIST runc-1.0.0_rc5_p20180509.tar.gz 1185576 BLAKE2B b56f9c185c061f51a1fd81c19d378b06c71d06c6eddcbc1c946b234814eb469ea4af37bf42ef3889e4d37bc430e69d0a563281b13055f855f1bc15935531fe28 SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3
+DIST runc-1.0.0_rc6.tar.gz 1202212 BLAKE2B 2795b6e88a9587fac61a50bfea52a9df8524eb87aae66129d7ea83e8c3ca586efc60a46d24af857f7ba50f8e4d7021cbd2845d322a8c0ad08be3e0f19d80ba3b SHA512 2f7ed5e835f000d9810a116a27300336f424ac2c370dd1c7d158e26a4997d1e8398612387be27cc22cc25fdd52cc4cff7963ef88ce9c41d337321b75d9be2334
 EBUILD runc-1.0.0_rc5-r1.ebuild 1296 BLAKE2B 837b2acae2f5b76fea1e49c4a49b8149e9f6fe5ac06555f1ec23720ab947d5586f00d333165a2fc200a22caa7a3616976f856bf45db6769db4b991c7d27ec0f5 SHA512 746a2751e39deebac58542a5a4687fd53523046e2b12f5f543a7ef7d891adc145bd4deaaf2e42535651eb608d2b58e5ee2f9c7db64c8c32bd5805934cc8c4c39
-EBUILD runc-1.0.0_rc5_p20180509.ebuild 1297 BLAKE2B c35d2a728996497e77cedc2cab14be52a5e3cc63b109263e101f546ae3af10834f461a3a233b4360285ce1badfb56b74df15abab3744d31c98ef8b612766f524 SHA512 a01ef90ca5f96f3c7a0ddca8a71653766f5c4371aceafa9c52bef38ac0a1d19deff827011b3a52b017363f508f8b4391de57b0756ec50ce3fac6d6e5231f0502
+EBUILD runc-1.0.0_rc5_p20180509.ebuild 1293 BLAKE2B fb959be90dcd20df0504a031ee478235cc3b7da2b2638441af00fd25036472ac9724682d54e6b1e7c66adf92dd40ea341c586cebc00a81860cf5be19b001c3f4 SHA512 f779767205e310998bd58f456c6a31670b6ac36fa859fda489c11f9053995890dca5473a27dbf229ad9c21776cde75a749cb9d787d8476e7207a33b2e601fcf8
+EBUILD runc-1.0.0_rc6.ebuild 1468 BLAKE2B 555c76381e17abcdb4c24d95602817a54bd5cdacb867de12b100842da272e1c076d85db961b2394c9781d05528d59863544a69a000598c928bc0871b0b94096e SHA512 867a0495da8d9c5ec78d9480b9ee053d26d5edd15eb57cf2777812040aa86fd41b3c471e2cd6acf61c1f5fd1c97ae2227995549121773a3b0d7c2ee319a0a410
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
-MISC metadata.xml 803 BLAKE2B ece04099f6ebb1afd33a01859d10dbb33f9f3606f262c0741406d3611da2f5841ab2e82e3852bdf8b38b8327920218eaeb43925c873a07a5c3a9ed368d408fd5 SHA512 4d628b6c0b34c18b6853d85a83725036a10b65b5266cf4f8a4df69c79882b03ae2a3c9c9ca1fe209998869e222f64efc6a89a8edc9ff3eec45bc9cb4391efd4e
+MISC metadata.xml 870 BLAKE2B e7fdbbe8bd178b4781f9a1345cb3473b9b2371db7f824ec3351a117d8c07c4dfa208eb1d1ef946576a6aa972bb055eba03c934f2388538998bee0e742e31151f SHA512 090b4cdf0cf933ad782e9b68df78aec48265222083a17c5f8e387943b9b535fe3d3ba751629f5c3978987572a2f1e821514e54a7f5327164f0ee8f5ce48efcdd
diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
index fcadd0bb8dda..d38c867c132b 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@@ -20,6 +20,9 @@
 		<flag name="apparmor">
 			Enable AppArmor support.
 		</flag>
+		<flag name="kmem">
+			Enable Kernel Memory Accounting.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">opencontainers/runc</remote-id>
diff --git a/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild b/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild
index 6447ca4dff6d..eb9cce7cf94b 100644
--- a/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-build golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/runc/runc-1.0.0_rc6.ebuild b/app-emulation/runc/runc-1.0.0_rc6.ebuild
new file mode 100644
index 000000000000..cb15bc43aaf8
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/opencontainers/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	RUNC_COMMIT="ccb5efd37fb7c86364786e9137e22948751de7ed" # Change this when you update the ebuild
+	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +kmem +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_prepare() {
+	default
+	sed -i -e "/^GIT_BRANCH/d"\
+		-e "/^GIT_BRANCH_CLEAN/d"\
+		-e "/^COMMIT_NO/d"\
+		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
+		src/${EGO_PN}/Makefile || die
+}
+
+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')
+	)
+
+	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
+}