From 8c7f9af2e65fe92653743eb3446eed8e513da3ca Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 11 Feb 2014 19:53:17 -0800
Subject: [PATCH] bump(coreos-base/coretest): Update to latest code, add live
 ebuild.

This increases our default timeout for the docker test to 60 seconds.
Update to our current scheme of keeping everything in the live ebuild.
---
 .../coretest/coretest-0.0.1-r1.ebuild         |  1 -
 .../coretest/coretest-0.0.1-r2.ebuild         |  1 +
 .../coretest/coretest-0.0.1.ebuild            | 29 ----------------
 .../coreos-base/coretest/coretest-9999.ebuild | 34 +++++++++++++++++++
 4 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r1.ebuild
 create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r2.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r1.ebuild
deleted file mode 120000
index 585e9989d5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-coretest-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r2.ebuild
new file mode 120000
index 0000000000..6d5e5a02f2
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r2.ebuild
@@ -0,0 +1 @@
+coretest-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1.ebuild
deleted file mode 100644
index fcdec2ae9c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Header:$
-#
-
-EAPI=4
-CROS_WORKON_COMMIT="000fa3a301fdfd04b3fe34e3a761285e5f7d12dd"
-CROS_WORKON_PROJECT="coreos/coretest"
-CROS_WORKON_LOCALNAME="coretest"
-CROS_WORKON_REPO="git://github.com"
-inherit cros-workon
-
-DESCRIPTION="Sanity tests for CoreOS"
-HOMEPAGE="https://github.com/coreos/coretest"
-SRC_URI=""
-
-LICENSE="APACHE"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.1"
-
-src_compile() {
-	./build
-}
-
-src_install() {
-	dobin "${S}/${PN}"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild
new file mode 100644
index 0000000000..4538bfc9d5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright (c) 2014 The CoreOS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/coretest"
+CROS_WORKON_LOCALNAME="coretest"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="daf0a79a981fd6912bad81978f15461f5e161f11"
+	KEYWORDS="amd64 arm x86"
+fi
+
+inherit cros-workon
+
+DESCRIPTION="Sanity tests for CoreOS"
+HOMEPAGE="https://github.com/coreos/coretest"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.1"
+
+src_compile() {
+	./build || die
+}
+
+src_install() {
+	dobin "${S}/${PN}"
+}