From a12074d375e2ffde327b9681981c6a505a25aa6c Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Wed, 21 May 2014 09:05:44 -0700
Subject: [PATCH] bump(dev-db/etcd): Update server and client to 0.4.1

---
 ...etcd-0.3.0-r9.ebuild => etcd-0.4.1.ebuild} |  0
 .../dev-db/etcd/etcd-9999.ebuild              |  2 +-
 .../dev-db/etcdctl/etcdctl-0.3.0.ebuild       | 30 -------------------
 .../dev-db/etcdctl/etcdctl-0.4.1.ebuild       |  1 +
 .../dev-db/etcdctl/etcdctl-9999.ebuild        |  7 +++++
 5 files changed, 9 insertions(+), 31 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.3.0-r9.ebuild => etcd-0.4.1.ebuild} (100%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
 create mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r9.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.1.ebuild
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 6072824a15..cff36c15a3 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
@@ -14,7 +14,7 @@ inherit toolchain-funcs cros-workon systemd
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
 else
-    CROS_WORKON_COMMIT="040c1f591efa735e24e794d5084ad07782123e3c"
+    CROS_WORKON_COMMIT="a2d16b52bb5a6e85b251f6f919ccdb03518e496d" # v0.4.1
     KEYWORDS="amd64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
deleted file mode 100644
index c34085cdc8..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2013 The CoreOS Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/etcdctl"
-CROS_WORKON_LOCALNAME="etcdctl"
-CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="54e8eaab737adcf887cf54d836cf91542f838fdc" # v0.3.0 tag
-
-inherit cros-workon
-
-DESCRIPTION="etcd command line client"
-HOMEPAGE="https://github.com/coreos/etcdctl"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND=""
-
-src_compile() {
-	./build
-}
-
-src_install() {
-	dobin ${S}/bin/${PN}
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.1.ebuild
new file mode 120000
index 0000000000..c934d478e0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.1.ebuild
@@ -0,0 +1 @@
+etcdctl-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
index 62bbacb921..19d8bdb073 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
@@ -6,6 +6,13 @@ CROS_WORKON_PROJECT="coreos/etcdctl"
 CROS_WORKON_LOCALNAME="etcdctl"
 CROS_WORKON_REPO="git://github.com"
 
+if [[ "${PV}" == 9999 ]]; then
+    KEYWORDS="~amd64"
+else
+    CROS_WORKON_COMMIT="43d576e9e84568372048f2b6cc912e7a5d048081" # v0.4.1
+    KEYWORDS="amd64"
+fi
+
 inherit cros-workon
 
 DESCRIPTION="etcd command line client"