Merge pull request #1173 from crawford/etcd

dev-db/etcd: remove starter

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

sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-0.0.3.ebuild

@@ -1 +0,0 @@
-etcd-starter-9999.ebuild

sdk_container/src/third_party/coreos-overlay/dev-db/etcd-starter/etcd-starter-9999.ebuild

@@ -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
-}

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}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
-	doexe "${S}/bin/${PN}"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	coreos-dodoc -r Documentation/*
 }

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
+	newbin "${WORKDIR}/gopath/bin/${PN}" "${PN}${SLOT}"
-	dobin ${WORKDIR}/gopath/bin/etcd-dump-logs
 
-	exeinto "/usr/${libexec}"
+	systemd_dounit "${FILESDIR}/${PN}${SLOT}.service"
-	doexe "${WORKDIR}/gopath/bin/${PN}"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}${SLOT}.conf"
 
 	coreos-dodoc -r Documentation/*
 }

sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=etcd
+Conflicts=etcd2.service
 
 [Service]
 User=etcd

sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd2.conf

@@ -0,0 +1 @@
+d    /var/lib/etcd2 0755 etcd etcd - -

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