From 69d3a2f87178657a8fc15450d98738c3c04cfddf Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 30 Mar 2015 16:04:38 -0700
Subject: [PATCH 1/3] dev-db/etcd-starter: remove the starter

---
 ...1-r251.ebuild => coreos-0.0.1-r252.ebuild} |  0
 .../coreos-base/coreos/coreos-0.0.1.ebuild    |  1 -
 .../etcd-starter/etcd-starter-0.0.3.ebuild    |  1 -
 .../etcd-starter/etcd-starter-9999.ebuild     | 51 -------------------
 .../dev-db/etcd-starter/files/etcd.conf       |  2 -
 .../dev-db/etcd-starter/files/etcd.service    | 12 -----
 6 files changed, 67 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r251.ebuild => coreos-0.0.1-r252.ebuild} (100%)
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r251.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r252.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r251.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r252.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 3bc6b9080a..24c981e487 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
@@ -109,7 +109,6 @@ RDEPEND="${RDEPEND}
 	coreos-base/coreos-init
 	coreos-base/coreos-cloudinit
 	coreos-base/coretest
-	dev-db/etcd-starter
 	net-analyzer/nmap
 	net-firewall/ebtables
 	net-firewall/ipset
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild
deleted file mode 120000
index 566b178428..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-etcd-starter-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild
deleted file mode 100644
index 54e4079efd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/etcd-starter"
-CROS_WORKON_LOCALNAME="etcd-starter"
-CROS_WORKON_REPO="git://github.com"
-COREOS_GO_PACKAGE="github.com/coreos/etcd-starter"
-inherit coreos-go cros-workon systemd
-
-if [[ "${PV}" == 9999 ]]; then
-    KEYWORDS="~amd64"
-else
-    CROS_WORKON_COMMIT="92b66f1e4c02d44a95eb51ea0e449bd6221f6b49" # v0.0.3
-    KEYWORDS="amd64"
-fi
-
-DESCRIPTION="etcd-starter"
-HOMEPAGE="https://github.com/coreos/etcd-starter"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="etcd_protocols_1 etcd_protocols_2"
-
-REQUIRED_USE="|| ( etcd_protocols_1 etcd_protocols_2 )"
-
-DEPEND=">=dev-lang/go-1.2"
-
-src_compile() {
-	go_build "${COREOS_GO_PACKAGE}"
-}
-
-src_install() {
-	local libexec="libexec/etcd/internal_versions"
-
-	if use etcd_protocols_1 && use etcd_protocols_2; then
-		dobin "${WORKDIR}/gopath/bin/${PN}"
-		dosym "${PN}" /usr/bin/etcd
-	elif use etcd_protocols_1; then
-		dosym "../${libexec}/1/etcd" /usr/bin/etcd
-	elif use etcd_protocols_2; then
-		dosym "../${libexec}/2/etcd" /usr/bin/etcd
-	fi
-
-	systemd_dounit "${FILESDIR}"/etcd.service
-	systemd_dotmpfilesd "${FILESDIR}"/etcd.conf
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf
deleted file mode 100644
index 721e9c9161..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d    /var/lib/etcd 0755 etcd etcd - -
-d    /var/run/etcd 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service
deleted file mode 100644
index 4d12c4bcbb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/files/etcd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=etcd
-
-[Service]
-User=etcd
-PermissionsStartOnly=true
-Environment=ETCD_DATA_DIR=/var/lib/etcd
-Environment=ETCD_NAME=%m
-ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
-LimitNOFILE=40000

From ffdcaaac2bfd2ce5adb305f936140aff80e812c3 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 30 Mar 2015 16:05:22 -0700
Subject: [PATCH 2/3] dev-db/etcd: write all v1 files from ebuild

---
 .../{etcd-0.4.9.ebuild => etcd-0.4.9-r1.ebuild}     | 13 ++++++++-----
 .../coreos-overlay/dev-db/etcd/files/etcd.conf      |  2 ++
 .../coreos-overlay/dev-db/etcd/files/etcd.service   | 13 +++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.4.9.ebuild => etcd-0.4.9-r1.ebuild} (70%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild
similarity index 70%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild
index 9140eebabf..5cc5f4d1f9 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=4
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-inherit coreos-doc toolchain-funcs cros-workon
+inherit coreos-doc toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -25,15 +25,18 @@ LICENSE="Apache-2.0"
 SLOT="1"
 
 DEPEND=">=dev-lang/go-1.2"
-RDEPEND="!dev-db/etcd:0"
+RDEPEND="!dev-db/etcd:0
+	!dev-db/etcd-starter"
 
 src_compile() {
 	./build
 }
 
 src_install() {
-	local libexec="libexec/${PN}/internal_versions/${SLOT}"
+	dobin "${S}/bin/${PN}"
 
-	exeinto "/usr/${libexec}"
-	doexe "${S}/bin/${PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
new file mode 100644
index 0000000000..721e9c9161
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
@@ -0,0 +1,2 @@
+d    /var/lib/etcd 0755 etcd etcd - -
+d    /var/run/etcd 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
new file mode 100644
index 0000000000..7f92d09f0d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=etcd
+Conflicts=etcd2.service
+
+[Service]
+User=etcd
+PermissionsStartOnly=true
+Environment=ETCD_DATA_DIR=/var/lib/etcd
+Environment=ETCD_NAME=%m
+ExecStart=/usr/bin/etcd
+Restart=always
+RestartSec=10s
+LimitNOFILE=40000

From 510db2b9582880708a77212ebfc8f5f65cd9602a Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 30 Mar 2015 16:07:42 -0700
Subject: [PATCH 3/3] dev-db/etcd: write all v2 files from ebuild

Remove etcd-migrate and etcd-dump-logs
---
 .../{etcd-2.0.8.ebuild => etcd-2.0.8-r1.ebuild}     |  0
 .../coreos-overlay/dev-db/etcd/etcd-9999.ebuild     | 13 ++++---------
 .../coreos-overlay/dev-db/etcd/files/etcd2.conf     |  1 +
 .../coreos-overlay/dev-db/etcd/files/etcd2.service  | 11 +++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-2.0.8.ebuild => etcd-2.0.8-r1.ebuild} (100%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.8-r1.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 e902517c36..00f46f5eb2 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
@@ -9,7 +9,7 @@ CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/etcd"
-inherit coreos-doc coreos-go toolchain-funcs cros-workon
+inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -33,19 +33,14 @@ RDEPEND="!dev-db/etcd:0
 src_compile() {
 	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() {
-	local libexec="libexec/${PN}/internal_versions/${SLOT}"
-
 	dobin ${WORKDIR}/gopath/bin/etcdctl
-	dobin ${WORKDIR}/gopath/bin/etcd-migrate
-	dobin ${WORKDIR}/gopath/bin/etcd-dump-logs
+	newbin "${WORKDIR}/gopath/bin/${PN}" "${PN}${SLOT}"
 
-	exeinto "/usr/${libexec}"
-	doexe "${WORKDIR}/gopath/bin/${PN}"
+	systemd_dounit "${FILESDIR}/${PN}${SLOT}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}${SLOT}.conf"
 
 	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
new file mode 100644
index 0000000000..d8bfc78710
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf
@@ -0,0 +1 @@
+d    /var/lib/etcd2 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
new file mode 100644
index 0000000000..bd1acc36b1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=etcd2
+Conflicts=etcd.service
+
+[Service]
+User=etcd
+Environment=ETCD_DATA_DIR=/var/lib/etcd2
+ExecStart=/usr/bin/etcd2
+Restart=always
+RestartSec=10s
+LimitNOFILE=40000