From 560045ab1d5f620332ce23122e6e7ec0f32fc94a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Fri, 24 Feb 2017 11:27:03 +0100 Subject: [PATCH] app-emulation/runc: Add blocker on app-emulation/docker-runc Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- app-emulation/runc/runc-1.0.0_rc2-r2.ebuild | 1 + app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild | 1 + app-emulation/runc/runc-9999.ebuild | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild b/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild index d00b1236e64b..986bc4219b76 100644 --- a/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild @@ -26,6 +26,7 @@ IUSE="apparmor hardened +seccomp" RDEPEND=" apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) + !app-emulation/docker-runc " S=${WORKDIR}/${P}/src/${EGO_PN} diff --git a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild b/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild index b68956acd459..1baca3eeee64 100644 --- a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild @@ -26,6 +26,7 @@ IUSE="apparmor hardened +seccomp" RDEPEND=" apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) + !app-emulation/docker-runc " S=${WORKDIR}/${P}/src/${EGO_PN} diff --git a/app-emulation/runc/runc-9999.ebuild b/app-emulation/runc/runc-9999.ebuild index a57511f78f0c..f186801bbbe6 100644 --- a/app-emulation/runc/runc-9999.ebuild +++ b/app-emulation/runc/runc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,8 @@ SLOT="0" IUSE="+seccomp" DEPEND=">=dev-lang/go-1.4:=" -RDEPEND="seccomp? ( sys-libs/libseccomp )" +RDEPEND="seccomp? ( sys-libs/libseccomp ) + !app-emulation/docker-runc" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 -- 2.26.2