From b49897ff3ce0576a9e277ae7a65dff3e0be5c17f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 18 Mar 2014 21:31:45 -0700
Subject: [PATCH] fix(coreos-base/*init): Retry conflict fix from e8403520

Too many in-flight things meant the fix didn't fix things. Re-bump.
---
 ...oudinit-0.1.2-r4.ebuild => coreos-cloudinit-0.1.2-r5.ebuild} | 0
 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild   | 2 +-
 ...oreos-init-0.0.1-r68.ebuild => coreos-init-0.0.1-r69.ebuild} | 0
 .../coreos-base/coreos-init/coreos-init-9999.ebuild             | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.1.2-r4.ebuild => coreos-cloudinit-0.1.2-r5.ebuild} (100%)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r68.ebuild => coreos-init-0.0.1-r69.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r5.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r5.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 c65eabcb82..80da4e4ec8 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
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.2
-	!<coreos-base/coreos-init-0.0.1-r67"
+	!<coreos-base/coreos-init-0.0.1-r69"
 
 RDEPEND="
 	>=sys-apps/shadow-4.1.5.1
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r68.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r69.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r68.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r69.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index c3e4451f31..d0f36d59b3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
 	sys-block/parted
 	sys-apps/gptfdisk
 	>=sys-apps/systemd-207-r5
-	>=coreos-base/coreos-cloudinit-0.1.1
+	>=coreos-base/coreos-cloudinit-0.1.2-r5
 	"
 
 src_install() {