From 24873ccad43399217491e11613499fb6ad367ba6 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 4 Apr 2015 13:02:51 -0700 Subject: [PATCH] rkt: add rocket conflict dependency Portage is not processing the rocket->rkt package move for me in /build/amd64-usr for some reason. Not sure what trick we are missing. As an alternative to the package move use a conflict to remove the old package instead. --- .../app-emulation/rkt/{rkt-0.5.3.ebuild => rkt-0.5.3-r1.ebuild} | 0 .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-0.5.3.ebuild => rkt-0.5.3-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 727f3554ca..bc3874c97e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -29,7 +29,7 @@ IUSE="" DEPEND=">=dev-lang/go-1.3 app-arch/cpio sys-fs/squashfs-tools" -RDEPEND="" +RDEPEND="!app-emulation/rocket" src_unpack() { local cache="${S}/stage1/rootfs/usr_from_coreos/cache"