From fa7742c46cecabff578d7de1b275559dc4c4e284 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 30 Jan 2014 13:59:14 -0800
Subject: [PATCH] fix(coreos-base/coreos-init): Sync up stable and live
 ebuilds.

Trying on a new scheme to use an if statement so we can share the same
ebuild between live and stable ebuilds. This should help avoid letting
the two get out of sync.
---
 .../coreos-init/coreos-init-0.0.1-r36.ebuild  |  2 +-
 .../coreos-init/coreos-init-0.0.1.ebuild      | 59 -------------------
 .../coreos-init/coreos-init-9999.ebuild       | 13 +++-
 3 files changed, 11 insertions(+), 63 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r36.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r36.ebuild
index f7b4679fcd..df02d424d0 120000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r36.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r36.ebuild
@@ -1 +1 @@
-coreos-init-0.0.1.ebuild
\ No newline at end of file
+coreos-init-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
deleted file mode 100644
index f5d89e590e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="8130badcdf5e8961c056ac8610df2a9c7ef40b07"
-CROS_WORKON_PROJECT="coreos/init"
-CROS_WORKON_LOCALNAME="init"
-EGIT_REPO_URI="https://github.com/coreos/init"
-
-inherit cros-workon systemd
-
-DESCRIPTION="Init scripts for CoreOS"
-HOMEPAGE="http://www.coreos.com/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test symlink-usr"
-
-# Daemons we enable here must installed during build/install in addition to
-# during runtime so the systemd unit enable step works.
-DEPEND="
-	app-emulation/docker
-	net-misc/dhcpcd
-	net-misc/openssh
-	!<dev-db/etcd-0.0.1-r6
-	!coreos-base/oem-service
-	test? ( dev-lang/python:2.7 )
-	"
-RDEPEND="${DEPEND}
-	sys-block/parted
-	sys-apps/gptfdisk
-	sys-apps/systemd
-	"
-
-src_install() {
-	if use symlink-usr ; then
-		emake DESTDIR="${D}" install-usr
-		systemd_enable_service local-fs.target remount-root.service
-	else
-		emake DESTDIR="${D}" install
-	fi
-
-	# Set the default target to multi-user not graphical, this is CoreOS!
-	dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-
-	systemd_enable_service basic.target coreos-startup.target
-
-	# Services!
-	systemd_enable_service default.target coreos-c10n.service
-	systemd_enable_service default.target local-enable.service
-	systemd_enable_service default.target dhcpcd.service
-	systemd_enable_service default.target sshd-keygen.service
-	systemd_enable_service default.target sshd.socket
-	systemd_enable_service default.target ssh-key-proc-cmdline.service
-	systemd_enable_service sockets.target docker.socket
-}
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 9bdf036835..dbb773a310 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
@@ -3,9 +3,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-EGIT_REPO_URI="https://github.com/coreos/init"
 CROS_WORKON_PROJECT="coreos/init"
 CROS_WORKON_LOCALNAME="init"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="8130badcdf5e8961c056ac8610df2a9c7ef40b07"
+	KEYWORDS="amd64 arm x86"
+fi
 
 inherit cros-workon systemd
 
@@ -15,12 +22,12 @@ SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test symlink-usr"
 
 # Daemons we enable here must installed during build/install in addition to
 # during runtime so the systemd unit enable step works.
 DEPEND="
+	app-emulation/docker
 	net-misc/dhcpcd
 	net-misc/openssh
 	!<dev-db/etcd-0.0.1-r6
@@ -53,5 +60,5 @@ src_install() {
 	systemd_enable_service default.target sshd-keygen.service
 	systemd_enable_service default.target sshd.socket
 	systemd_enable_service default.target ssh-key-proc-cmdline.service
-	systemd_enable_service default.target docker.service
+	systemd_enable_service sockets.target docker.socket
 }