From 5de443b470f34f1a36fd1e4d8576a9612a950ed5 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 18:48:56 -0700 Subject: [PATCH] fix(coreos-base/coreos-init): conflicting ebuild was edited without bump --- ...udinit-0.1.2-r3.ebuild => coreos-cloudinit-0.1.2-r4.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 3 ++- ...reos-init-0.0.1-r66.ebuild => coreos-init-0.0.1-r67.ebuild} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.1.2-r3.ebuild => coreos-cloudinit-0.1.2-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r66.ebuild => coreos-init-0.0.1-r67.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 571b94741a..216909b850 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -23,7 +23,8 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="" -DEPEND=">=dev-lang/go-1.2" +DEPEND=">=dev-lang/go-1.2 + !