From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-910024-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 B26261395E2
for <garchives@archives.gentoo.org>; Sun, 6 Nov 2016 09:32:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F366DE0852;
Sun, 6 Nov 2016 09:32:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C5961E0852
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 09:32:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B54E0341654
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 09:32:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EFFF724B4
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 09:32:27 +0000 (UTC)
From: "Jeroen Roovers" <jer@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, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1478424742.97f8b8c6dbf5002dfbba5a4913aee7d55f0b4605.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/chrony/chrony-2.4-r1.ebuild net-misc/chrony/chrony-9999.ebuild
X-VCS-Directories: net-misc/chrony/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 97f8b8c6dbf5002dfbba5a4913aee7d55f0b4605
X-VCS-Branch: master
Date: Sun, 6 Nov 2016 09:32:27 +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: d06695e1-65b8-45fa-9c10-e951c5126bde
X-Archives-Hash: cd04561c1cee8d4724adda96e6f1de53
commit: 97f8b8c6dbf5002dfbba5a4913aee7d55f0b4605
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 09:27:32 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 09:32:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f8b8c6
net-misc/chrony: Drop USE=pps preference now that it has a dependency. Update live ebuild.
Package-Manager: portage-2.3.2
net-misc/chrony/chrony-2.4-r1.ebuild | 7 ++++---
net-misc/chrony/chrony-9999.ebuild | 26 ++++++++++++++++----------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/net-misc/chrony/chrony-2.4-r1.ebuild b/net-misc/chrony/chrony-2.4-r1.ebuild
index c2601db..954f266 100644
--- a/net-misc/chrony/chrony-2.4-r1.ebuild
+++ b/net-misc/chrony/chrony-2.4-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils systemd toolchain-funcs
DESCRIPTION="NTP client and server programs"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
"
@@ -41,6 +41,8 @@ src_prepare() {
-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-e 's:/var/run:/run:g' \
conf.c doc/*.man.in examples/* || die
+
+ default
}
src_configure() {
@@ -89,7 +91,6 @@ src_configure() {
src_compile() {
emake all docs $(usex html '' 'ADOC=true')
-
}
src_install() {
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 13709c0..b744729 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils git-r3 systemd toolchain-funcs
DESCRIPTION="NTP client and server programs"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
"
@@ -20,11 +20,12 @@ REQUIRED_USE="
CDEPEND="
caps? ( sys-libs/libcap )
libedit? ( dev-libs/libedit )
+ pps? ( net-misc/pps-tools )
readline? ( >=sys-libs/readline-4.1-r4:= )
"
DEPEND="
${CDEPEND}
- sys-apps/texinfo
+ html? ( dev-ruby/asciidoctor )
"
RDEPEND="
${CDEPEND}
@@ -39,7 +40,9 @@ src_prepare() {
sed -i \
-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-e 's:/var/run:/run:g' \
- conf.c chrony.texi.in examples/* || die
+ conf.c doc/*.man.in examples/* || die
+
+ default
}
src_configure() {
@@ -73,7 +76,6 @@ src_configure() {
${EXTRA_ECONF} \
--docdir=/usr/share/doc/${PF} \
--chronysockdir=/run/chrony \
- --infodir=/usr/share/info \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/etc/chrony \
@@ -88,26 +90,30 @@ src_configure() {
}
src_compile() {
- emake all docs
+ emake all docs $(usex html '' 'ADOC=true')
}
src_install() {
default
- doinfo chrony.info*
-
newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
newconfd "${FILESDIR}"/chronyd.conf chronyd
insinto /etc/${PN}
newins examples/chrony.conf.example1 chrony.conf
+ docinto examples
dodoc examples/*.example*
+ if use html; then
+ docinto html
+ dodoc doc/*.html
+ fi
+
keepdir /var/{lib,log}/chrony
insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+ newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
systemd_enable_ntpunit 50-chrony chronyd.service