[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-runc/

[Manuel Rüger]

commit:     b014f1073469d86c98637e55c6331eb918c82eb9
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 11:13:42 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 11:24:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b014f107

app-emulation/docker-runc: Update to a snapshot that is going to be used by 
docker 17.06

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-emulation/docker-runc/Manifest                 |  1 +
 .../docker-runc-1.0.0_rc3_p20170607.ebuild         | 59 ++++++++++++++++++++++
 app-emulation/docker-runc/metadata.xml             |  5 +-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/app-emulation/docker-runc/Manifest 
b/app-emulation/docker-runc/Manifest
index c4a3d658039..b63a3e7e6cf 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,2 +1,3 @@
 DIST docker-runc-1.0.0_rc2_p20170308.tar.gz 561400 SHA256 
bdd0fc0b5db42bb1fc439d5a5d6347d97b285e676559afb620ffd9f62fc1de26 SHA512 
f17c7ff09578573a161f14616446e74d92d66039c1462bce23ea507b151eb66ede12d2ca583d3dace21d186a80bdadf222fc180bf1123e29c68e43f2f2d949c8
 WHIRLPOOL 
f6853ccdd09ca1481828b20e64403151cd9c5d46ceb81c50e884d47e18f8594c21bf53102b252852b259b6b0186f54f070fb7f3c7e4447123cbf05aa69233035
 DIST docker-runc-1.0.0_rc2_p20170310.tar.gz 561483 SHA256 
b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 SHA512 
225a37b4a3a79ff0d7a3e74b997f6e5547e270d02c58e65ccb5ea2d81771c489378727bd6abf2f445ea94c2e7717e2991da9fb4cab74327fd57c0e6218143cc3
 WHIRLPOOL 
ecf6ee1d2ed977b74d0d5d5dbf3ff2cc96728bd680a13c58f715dea2401002b0da461d6d2d9ac6af35f290a356821b19175e6f5004fa25b3c8d82eca69d87965
+DIST docker-runc-1.0.0_rc3_p20170607.tar.gz 1043233 SHA256 
b363764efc58fc25757b71b8f64569f1f1f81f0beaa5cc3542ed7d602f15fa75 SHA512 
53b9bc1ffd0c76e886a0eb9d9f0c78238b5bd7ca59884138c0ef438322b3b3b09d58a36e0fec8f6daa8b465323b7dc38515a915945f2009233e343b2ec3eca14
 WHIRLPOOL 
f6069ea7cb9100be36ad40fbd24a46de65837e2408dd045fbb69aa6c6442f0ac662feba8f61caf21ef0aec1fcfed3a47b60e87f179012580d46e3dd041865f32

diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170607.ebuild 
b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170607.ebuild
new file mode 100644
index 00000000000..9fcf75f8485
--- /dev/null
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170607.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/opencontainers/${PN/docker-}"
+
+if [[ ${PV} == *9999 ]]; then
+       inherit golang-vcs
+else
+       MY_PV="${PV/_/-}"
+       EGIT_COMMIT="2d41c047c83e09a6d61d464906feb2a2f3c52aa4"
+       RUNC_COMMIT="2d41c04" # Change this when you update the ebuild
+       SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~ppc64"
+       inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools (docker fork)"
+HOMEPAGE="http://runc.io";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor ambient hardened +seccomp"
+
+RDEPEND="
+       apparmor? ( sys-libs/libapparmor )
+       seccomp? ( sys-libs/libseccomp )
+       !app-emulation/runc
+"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+       default
+       sed -i -e "s/git rev-parse.*\$/echo gentoo)/" -e "/COMMIT :=/d" -e 
"/COMMIT_NO :=/d" 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 apparmor 'apparmor' '')
+               $(usex ambient 'ambient' '')
+               $(usex seccomp 'seccomp' '')
+       )
+
+       GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
+               COMMIT="${RUNC_COMMIT}"
+}
+
+src_install() {
+       dobin runc
+}

diff --git a/app-emulation/docker-runc/metadata.xml 
b/app-emulation/docker-runc/metadata.xml
index 4a3ebf6cbb7..9fe8126b58a 100644
--- a/app-emulation/docker-runc/metadata.xml
+++ b/app-emulation/docker-runc/metadata.xml
@@ -10,9 +10,8 @@
                <name>Manuel Rüger</name>
        </maintainer>
        <use>
-               <flag name="apparmor">
-                       Enable AppArmor support.
-               </flag>
+               <flag name="ambient">Enable support for ambient 
capability</flag>
+               <flag name="apparmor">Enable AppArmor support</flag>
        </use>
        <upstream>
                <remote-id type="github">docker/runc</remote-id>