From 10f3130d41f6c9c2220ab62133c9a7865be6a3fd Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 10 Feb 2015 16:21:13 -0800
Subject: [PATCH] etcd: add v2.0.4

---
 ...1-r246.ebuild => coreos-0.0.1-r247.ebuild} |  0
 .../coreos-base/coreos/coreos-0.0.1.ebuild    |  7 +++--
 .../dev-db/etcd/etcd-2.0.4.ebuild             |  1 +
 .../dev-db/etcd/etcd-9999.ebuild              | 28 ++++++++++++++-----
 4 files changed, 27 insertions(+), 9 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r246.ebuild => coreos-0.0.1-r247.ebuild} (100%)
 create mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r246.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r247.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r246.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r247.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index bbf68b3bff..146c13298c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -80,8 +80,11 @@ RDEPEND="${RDEPEND}
 # If protocol 1 is installed it must be configured to provide the default
 # implementation based on whether protocol 2 is enabled or not.
 RDEPEND="${RDEPEND}
-	dev-db/etcdctl
-	etcd_protocols_1? ( dev-db/etcd:1[etcd_protocols_2=] )
+	etcd_protocols_1? (
+		dev-db/etcd:1[etcd_protocols_2=]
+		!etcd_protocols_2? ( dev-db/etcdctl )
+	)
+	etcd_protocols_2? ( dev-db/etcd:2 )
 	"
 
 RDEPEND="${RDEPEND}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4.ebuild
new file mode 120000
index 0000000000..f972b32dc1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4.ebuild
@@ -0,0 +1 @@
+etcd-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index 98e5c59f38..a149b478af 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -1,19 +1,20 @@
 #
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
+# Copyright (c) 2015 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 # $Header:$
 #
 
-EAPI=4
+EAPI=5
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-inherit coreos-doc toolchain-funcs cros-workon systemd
+COREOS_GO_PACKAGE="github.com/coreos/etcd"
+inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
 else
-    CROS_WORKON_COMMIT="d6523fe4638100c72f40cb282cd1232db13f7336" # v0.4.7
+    CROS_WORKON_COMMIT="1a2c6d3f2fbcb047712bfa3234bff5b9d07bdc57" # v2.0.4
     KEYWORDS="amd64"
 fi
 
@@ -22,17 +23,30 @@ HOMEPAGE="https://github.com/coreos/etcd"
 SRC_URI=""
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.2"
+RDEPEND="!dev-db/etcd:0
+	!dev-db/etcdctl"
 
 src_compile() {
-	./build
+	go_build "${COREOS_GO_PACKAGE}"
+	go_build "${COREOS_GO_PACKAGE}/etcdctl"
+	go_build "${COREOS_GO_PACKAGE}/tools/etcd-migrate"
+	go_build "${COREOS_GO_PACKAGE}/tools/etcd-dump-logs"
 }
 
 src_install() {
-	dobin ${S}/bin/${PN}
+	local libexec="libexec/${PN}/internal_versions"
+
+	dobin ${WORKDIR}/gopath/bin/etcdctl
+	dobin ${WORKDIR}/gopath/bin/etcd-migrate
+	dobin ${WORKDIR}/gopath/bin/etcd-dump-logs
+
+	exeinto "/usr/${libexec}"
+	newexe "${WORKDIR}/gopath/bin/${PN}" ${SLOT}
+	dosym "../${libexec}/${SLOT}" /usr/bin/${PN}
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf