From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 24 Feb 2018 19:58:07 +0000
Subject: gentoo resync : 24.02.2018

---
 dev-db/etcd/Manifest          |  4 ++--
 dev-db/etcd/etcd-3.3.1.ebuild | 37 ++++++++++++++++++++-----------------
 dev-db/etcd/metadata.xml      |  3 +++
 3 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'dev-db/etcd')

diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index c78c6f427bab..27dfeae8098b 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -13,5 +13,5 @@ EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf
 EBUILD etcd-3.2.14.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.2.15.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.3.0.ebuild 1505 BLAKE2B 389577b47be34dd34de648fdd0cf036973374685577a284ee09459b2b25adb5590f84d88cf5057d43508e0fd7f6925e1d65a86a2714ebb09fcc4991f21895f9c SHA512 c1212aa97afdaf6afe85524c515fdb545934ce52a84a599c55b8212f209a2433639dd5579e2edf06f0c1966a59707e7094146791e3ef9d3b8947dd0f01b2bfeb
-EBUILD etcd-3.3.1.ebuild 1505 BLAKE2B 389577b47be34dd34de648fdd0cf036973374685577a284ee09459b2b25adb5590f84d88cf5057d43508e0fd7f6925e1d65a86a2714ebb09fcc4991f21895f9c SHA512 c1212aa97afdaf6afe85524c515fdb545934ce52a84a599c55b8212f209a2433639dd5579e2edf06f0c1966a59707e7094146791e3ef9d3b8947dd0f01b2bfeb
-MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
+EBUILD etcd-3.3.1.ebuild 1576 BLAKE2B 12f9a212574f9d465d9282d535095a810f0d3b3a258f1d011840008929053bc79e41e4b790af570130ab9fdd416a8e9fdc470a3e50a631ea51b2525db792a4ef SHA512 79c9f82c17696c3331f8fd795117b04f88b6e39495d5ef20ca9ce364f763d69bb2d5a0527b3d3c7dbe3901968e33462dd7587465414d21bc93b8d9a47a7ba529
+MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.1.ebuild b/dev-db/etcd/etcd-3.3.1.ebuild
index b1406dc1a18b..7ec5b9eda5c9 100644
--- a/dev-db/etcd/etcd-3.3.1.ebuild
+++ b/dev-db/etcd/etcd-3.3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/coreos/etcd"
 SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc"
+IUSE="doc +server"
 DEPEND=">=dev-lang/go-1.9:="
 RDEPEND="!dev-db/etcdctl"
 
@@ -37,23 +37,26 @@ src_compile() {
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
+	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 0700 /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
 	popd || die
 }
 
diff --git a/dev-db/etcd/metadata.xml b/dev-db/etcd/metadata.xml
index c07ccbfad9c4..f48ad8fcc96f 100644
--- a/dev-db/etcd/metadata.xml
+++ b/dev-db/etcd/metadata.xml
@@ -7,6 +7,9 @@
 		<doc>https://github.com/coreos/etcd/blob/master/README.md/</doc>
 		<remote-id type="github">coreos/etcd</remote-id>
 	</upstream>
+	<use>
+		<flag name="server">Installs etcd daemon</flag>
+	</use>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
-- 
cgit v1.2.3