From 306f88f4a3f08807aa42802e19c0698d86bc32c9 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Wed, 29 May 2013 15:12:16 -0700
Subject: [PATCH] fix(app-admin/etcd*): Use correct version layout

etcd client and etcd were not rebuilding because 9999 was not masked.
Fix this.
---
 .../etcd-client/etcd-client-0.0.1-r1.ebuild   |  1 +
 .../etcd-client/etcd-client-0.0.1.ebuild      | 36 ++++++++++++++++++
 .../etcd-client/etcd-client-9999.ebuild       |  2 +-
 .../app-admin/etcd/etcd-0.0.1-r1.ebuild       |  1 +
 .../app-admin/etcd/etcd-0.0.1.ebuild          | 38 +++++++++++++++++++
 .../app-admin/etcd/etcd-9999.ebuild           |  2 +-
 6 files changed, 78 insertions(+), 2 deletions(-)
 create mode 120000 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild
 create mode 120000 sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.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
new file mode 120000
index 0000000000..b27c4ba86d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1-r1.ebuild
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000000..5618eaaa6a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-0.0.1.ebuild
@@ -0,0 +1,36 @@
+#
+# 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-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
index 0932adabc7..ff35e2bf1d 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.0.2"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r1.ebuild
new file mode 120000
index 0000000000..a6e5e5dcc1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1-r1.ebuild
@@ -0,0 +1 @@
+etcd-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild
new file mode 100644
index 0000000000..4db7fa0856
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-0.0.1.ebuild
@@ -0,0 +1,38 @@
+#
+# 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"
+CROS_WORKON_LOCALNAME="etcd"
+CROS_WORKON_REPO="git://github.com"
+CROS_WORKON_COMMIT="f4301f994c995d7e91214e082fa18312899b4131"
+inherit toolchain-funcs cros-workon systemd
+
+DESCRIPTION="etcd"
+HOMEPAGE="https://github.com/xiangli-cmu/etcd"
+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}
+}
+
+src_install() {
+	dosbin ${S}/${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_enable_service multi-user.target ${PN}.service
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
index dca86b55c6..43209c5e78 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.0.2"