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] 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