From 83c7c9e09177fec04393163d38254528fdf26016 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: Fri, 7 Feb 2014 18:59:55 -0800
Subject: [PATCH 1/4] fix(etcd-client): Remove defunct etcd-client ebuilds

---
 .../etcd-client/etcd-client-0.0.1-r1.ebuild   |  1 -
 .../etcd-client/etcd-client-0.0.1.ebuild      | 36 -------------------
 .../etcd-client/etcd-client-99999.ebuild      | 35 ------------------
 3 files changed, 72 deletions(-)
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-99999.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild
deleted file mode 120000
index b27c4ba86d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-etcd-client-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild
deleted file mode 100644
index 5618eaaa6a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=2
-CROS_WORKON_PROJECT="coreos/etcd-client"
-CROS_WORKON_LOCALNAME="etcd-client"
-CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="350501cefd98d7d816efaf7c650ad49c6c3dbc89"
-inherit toolchain-funcs cros-workon systemd
-
-DESCRIPTION="etcd-client"
-HOMEPAGE="https://github.com/xiangli-cmu/etcd-client"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.0.2"
-GOROOT="${ED}usr/$(get_libdir)/go"
-GOPKG="${PN}"
-
-src_compile() {
-	export GOPATH="${S}"
-	go get
-	go build -o ${PN} || die
-}
-
-src_install() {
-	dobin ${S}/${PN} || die
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-99999.ebuild
deleted file mode 100644
index ff35e2bf1d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-99999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=2
-CROS_WORKON_PROJECT="coreos/etcd-client"
-CROS_WORKON_LOCALNAME="etcd-client"
-CROS_WORKON_REPO="git://github.com"
-inherit toolchain-funcs cros-workon systemd
-
-DESCRIPTION="etcd-client"
-HOMEPAGE="https://github.com/xiangli-cmu/etcd-client"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.0.2"
-GOROOT="${ED}usr/$(get_libdir)/go"
-GOPKG="${PN}"
-
-src_compile() {
-	export GOPATH="${S}"
-	go get
-	go build -o ${PN} || die
-}
-
-src_install() {
-	dobin ${S}/${PN} || die
-}

From 500a256c63c16bd5a4e143fc9218842f167cbac5 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: Fri, 7 Feb 2014 19:00:28 -0800
Subject: [PATCH 2/4] fix(etcd-lib): Remove defunct etcd-lib ebuilds

---
 .../etcd-lib/etcd-lib-0.0.1-r9.ebuild         |  1 -
 .../app-admin/etcd-lib/etcd-lib-0.0.1.ebuild  | 38 -------------------
 2 files changed, 39 deletions(-)
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r9.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r9.ebuild
deleted file mode 120000
index 3cf57b4e08..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1-r9.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-etcd-lib-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild
deleted file mode 100644
index 87caf5999a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-lib/etcd-lib-0.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=2
-EGIT_REPO_SERVER="https://bitbucket.org"
-EGIT_REPO_URI="${EGIT_REPO_SERVER}/coreos/etcd-lib.git"
-EGIT_BRANCHEGIT_BRANCH="master"
-
-inherit git systemd
-
-DESCRIPTION="Experiments in using etcd"
-HOMEPAGE="https://bitbucket.org/coreos/etcd-libs"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-# TODO, use cros
-#CROS_WORKON_PROJECT="coreos/etcd-libs"
-#CROS_WORKON_LOCALNAME="etcd-libs"
-#CROS_WORKON_REPO="https://bitbucket.org"
-#inherit toolchain-funcs cros-workon systemd
-
-
-src_install() {
-	systemd_dounit "${S}"/etcd@.service
-	dodir /usr/lib/etcd/
-	insinto /usr/lib/etcd/
-	cp -Ra "${S}"/* ${D}/usr/lib/etcd/
-
-	dodir /var/lib/containers
-	dodir /var/lib/systemd-rest
-}

From 95ee11f368a5eef033f99b0cb1d836ccf093d9f4 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: Fri, 7 Feb 2014 19:04:22 -0800
Subject: [PATCH 3/4] bump(etcd): Upgrade etcd and etcdctl to v0.3.0

Additionally, use the correct bin-path to pull in the
etcd and etcdctl binaries.
---
 .../dev-db/etcd/{etcd-0.2.0.ebuild => etcd-0.3.0.ebuild}      | 4 ++--
 .../third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild  | 2 +-
 .../etcdctl/{etcdctl-0.2.0.ebuild => etcdctl-0.3.0.ebuild}    | 4 ++--
 .../coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.2.0.ebuild => etcd-0.3.0.ebuild} (88%)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/{etcdctl-0.2.0.ebuild => etcdctl-0.3.0.ebuild} (81%)

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
similarity index 88%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
index 63e60df2cf..2196d17dec 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.2.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
@@ -9,7 +9,7 @@ EAPI=4
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="5271378fc2c76f9c368f8ef96623d156888fbffa" # hash for tag v0.2.0
+CROS_WORKON_COMMIT="f9d27c37aa9bc12a51a6675e93cae454415aa3fa" # v0.3.0 tag
 inherit toolchain-funcs cros-workon systemd
 
 DESCRIPTION="etcd"
@@ -28,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/${PN}
+	dobin ${S}/bin/${PN}
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
index 9d6f87b8f2..15d65e830a 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
@@ -27,7 +27,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/${PN}
+	dobin ${S}/bin/${PN}
 	dobin ${FILESDIR}/etcd-bootstrap
 	dobin ${FILESDIR}/etcd-pre-exec
 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
similarity index 81%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
index 4cca6ccafe..fbd6fa5200 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.2.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 CROS_WORKON_PROJECT="coreos/etcdctl"
 CROS_WORKON_LOCALNAME="etcdctl"
 CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_COMMIT="ee096789193311aa6ea0717c8b31f4cf8c2dfe7d" # v0.2.0 tag + version flag
+CROS_WORKON_COMMIT="54e8eaab737adcf887cf54d836cf91542f838fdc" # v0.3.0 tag
 
 inherit cros-workon
 
@@ -26,5 +26,5 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/${PN}
+	dobin ${S}/bin/${PN}
 }
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 61a9e64f63..3937971f3d 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
@@ -25,5 +25,5 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/${PN}
+	dobin ${S}/bin/${PN}
 }

From 6f216aa781712954e858d90151866a5b67664f70 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: Fri, 7 Feb 2014 19:05:25 -0800
Subject: [PATCH 4/4] fix(etcd): Use go1.2 in etcd and etcdctl ebuilds

---
 .../third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild    | 2 +-
 .../third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild    | 2 +-
 .../coreos-overlay/dev-db/etcdctl/etcdctl-0.3.0.ebuild          | 2 +-
 .../coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
index 2196d17dec..1989e9d6e6 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.1"
+DEPEND=">=dev-lang/go-1.2"
 
 src_compile() {
 	./build
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
index 15d65e830a..492425ca17 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.1"
+DEPEND=">=dev-lang/go-1.2"
 
 src_compile() {
 	./build
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
index fbd6fa5200..c34085cdc8 100644
--- 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
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.1"
+DEPEND=">=dev-lang/go-1.2"
 RDEPEND=""
 
 src_compile() {
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 3937971f3d..62bbacb921 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
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.1"
+DEPEND=">=dev-lang/go-1.2"
 RDEPEND=""
 
 src_compile() {