From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1005365-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2E52C1382C5
for <garchives@archives.gentoo.org>; Fri, 23 Feb 2018 16:31:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 520F6E0802;
Fri, 23 Feb 2018 16:31:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 22942E0802
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Feb 2018 16:31:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AD231335C0C
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Feb 2018 16:31:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 399A61A7
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Feb 2018 16:31:20 +0000 (UTC)
From: "Manuel Rüger" <mrueg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" <mrueg@gentoo.org>
Message-ID: <1519403450.7d2e52b7ec550cfd2a19a1639abea4a9b765e392.mrueg@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/etcd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/etcd/etcd-3.3.1.ebuild dev-db/etcd/metadata.xml
X-VCS-Directories: dev-db/etcd/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: 7d2e52b7ec550cfd2a19a1639abea4a9b765e392
X-VCS-Branch: master
Date: Fri, 23 Feb 2018 16:31:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 73cce05d-4ebd-4935-b6fe-5c1537126468
X-Archives-Hash: 9019da645e70f36778b2251c1583a833
commit: 7d2e52b7ec550cfd2a19a1639abea4a9b765e392
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 16:30:29 2018 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 16:30:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2e52b7
dev-db/etcd: Add support to only install etcdctl
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/etcd/etcd-3.3.1.ebuild | 37 ++++++++++++++++++++-----------------
dev-db/etcd/metadata.xml | 3 +++
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/dev-db/etcd/etcd-3.3.1.ebuild b/dev-db/etcd/etcd-3.3.1.ebuild
index b1406dc1a18..7ec5b9eda5c 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 c07ccbfad9c..f48ad8fcc96 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>