From b7bde0b21ce5c486a129873cfc9c7f708c6135be Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 21 Jun 2013 16:34:08 -0400
Subject: [PATCH] fix(profiles): Don't use live ebuilds by default.

As-is catalyst and cros-workon's live ebuilds don't mix since the
catalyst chroot does not provide /mnt/host like the sdk chroot does.
Besides, only people actively working on a project should use the live
versions since anyone else will install it one time and then never
upgrade after that, even when the version marked stable is actually
newer than their old live build.

For SDK builds this means not accepting ~amd64 for core-admin and
update_engine and adding a stable ebuild for core-admin. (update_engine
already has a stable ebuild which is even up-to-date)
---
 .../core-admin/core-admin-0.0.1-r1.ebuild     |  1 +
 .../core-admin/core-admin-0.0.1.ebuild        | 33 +++++++++++++++++++
 .../core-admin/core-admin-9999.ebuild         |  1 +
 .../default/linux/package.accept_keywords     |  6 ----
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild
new file mode 120000
index 0000000000..3187faa5c7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild
@@ -0,0 +1 @@
+core-admin-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild
new file mode 100644
index 0000000000..425ac63652
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2013 Brandon Philips. All rights reserved.
+# Distributed under the terms of the MIT License
+# $Header:$
+#
+
+EAPI=2
+CROS_WORKON_COMMIT="54aba86ecd7cd32c3488df9dc9beab27b37cec0b"
+CROS_WORKON_PROJECT="coreos/core-admin"
+CROS_WORKON_LOCALNAME="core-admin"
+CROS_WORKON_REPO="git://github.com"
+inherit toolchain-funcs cros-workon
+
+DESCRIPTION="systemd over rest"
+HOMEPAGE="https://github.com/coreos/core-admin"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.0.2"
+
+src_compile() {
+	export GOPATH="${S}"
+	go get
+	go build -o ${PN} || die
+}
+
+src_install() {
+	dobin ${S}/${PN}
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild
index bd6fa74e23..084a98749a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild
@@ -7,6 +7,7 @@
 EAPI=2
 CROS_WORKON_PROJECT="coreos/core-admin"
 CROS_WORKON_LOCALNAME="core-admin"
+CROS_WORKON_REPO="git://github.com"
 inherit toolchain-funcs cros-workon
 
 DESCRIPTION="systemd over rest"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
index 1506117e7d..33981c6761 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
@@ -86,12 +86,6 @@
 # Replace the function.sh script in baselayout
 =sys-apps/efunctions-1 ~amd64 ~x86
 
-# Projects we are actively hacking on in coreos
-=coreos-base/update_engine-9999 ~amd64 ~x86
-
-# Used on the host
-=coreos-base/core-admin-9999	~amd64 ~x86
-
 #=dev-libs/libxml2-2.9.0-r1 ~amd64
 
 =sys-apps/util-linux-2.23 ~amd64