[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/

[Jeroen Roovers]

commit:     196da06d54f0c7b91c8cbb6c2ad157b28d15ac9b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 14:16:21 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 14:16:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196da06d

net-misc/chrony: Update live ebuild.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-misc/chrony/chrony-9999.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index ac4e878733e..3281755d086 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -15,6 +15,7 @@ IUSE="caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp se
 REQUIRED_USE="
 	?? ( libedit readline )
 "
+
 CDEPEND="
 	caps? ( sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
@@ -40,9 +41,8 @@ PATCHES=(
 src_prepare() {
 	default
 	sed -i \
-		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-		-e 's:/var/run:/run:g' \
-		conf.c doc/*.adoc examples/* || die
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
 }
 
 src_configure() {
@@ -75,12 +75,13 @@ src_configure() {
 		$(usex rtc '' --disable-rtc) \
 		${CHRONY_EDITLINE} \
 		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
 		--chronysockdir=/run/chrony \
+		--disable-sechash \
+		--docdir=/usr/share/doc/${PF} \
 		--mandir=/usr/share/man \
 		--prefix=/usr \
 		--sysconfdir=/etc/chrony \
-		--disable-sechash \
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss \
 		--without-tomcrypt
 	"
@@ -97,7 +98,7 @@ src_compile() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
 	newconfd "${FILESDIR}"/chronyd.conf chronyd
 
 	insinto /etc/${PN}