From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 4 Oct 2015 06:55:36 +0000 (+0200)
Subject: net-misc/chrony: Configure the default socket directory. Do not install deprecated... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c60531546d884511b25770e8dc43943cb2a23d8;p=gentoo.git

net-misc/chrony: Configure the default socket directory. Do not install deprecated chrony.keys. Install a simple default configuration.

Package-Manager: portage-2.2.22
---

diff --git a/net-misc/chrony/chrony-2.2_pre1.ebuild b/net-misc/chrony/chrony-2.2_pre1.ebuild
index 70f4f6072b83..f745441b0286 100644
--- a/net-misc/chrony/chrony-2.2_pre1.ebuild
+++ b/net-misc/chrony/chrony-2.2_pre1.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 	sed -i \
 		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
 		-e 's:/var/run:/run:g' \
-		conf.c chrony.texi.in examples/* FAQ || die
+		conf.c chrony.texi.in examples/* || die
 }
 
 src_configure() {
@@ -72,6 +72,7 @@ src_configure() {
 		${CHRONY_EDITLINE} \
 		${EXTRA_ECONF} \
 		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--prefix=/usr \
@@ -99,8 +100,7 @@ src_install() {
 	newconfd "${FILESDIR}"/chronyd.conf chronyd
 
 	insinto /etc/${PN}
-	newins examples/chrony.conf.example3 chrony.conf
-	newins examples/chrony.keys.example chrony.keys
+	newins examples/chrony.conf.example1 chrony.conf
 
 	dodoc examples/*.example*