| 1 |
commit: 97f8b8c6dbf5002dfbba5a4913aee7d55f0b4605 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 09:27:32 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 09:32:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f8b8c6 |
| 7 |
|
| 8 |
net-misc/chrony: Drop USE=pps preference now that it has a dependency. Update live ebuild. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
net-misc/chrony/chrony-2.4-r1.ebuild | 7 ++++--- |
| 13 |
net-misc/chrony/chrony-9999.ebuild | 26 ++++++++++++++++---------- |
| 14 |
2 files changed, 20 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/chrony/chrony-2.4-r1.ebuild b/net-misc/chrony/chrony-2.4-r1.ebuild |
| 17 |
index c2601db..954f266 100644 |
| 18 |
--- a/net-misc/chrony/chrony-2.4-r1.ebuild |
| 19 |
+++ b/net-misc/chrony/chrony-2.4-r1.ebuild |
| 20 |
@@ -2,7 +2,7 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
-EAPI=5 |
| 25 |
+EAPI=6 |
| 26 |
inherit eutils systemd toolchain-funcs |
| 27 |
|
| 28 |
DESCRIPTION="NTP client and server programs" |
| 29 |
@@ -12,7 +12,7 @@ LICENSE="GPL-2" |
| 30 |
SLOT="0" |
| 31 |
|
| 32 |
KEYWORDS="~amd64" |
| 33 |
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" |
| 34 |
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns" |
| 35 |
REQUIRED_USE=" |
| 36 |
?? ( libedit readline ) |
| 37 |
" |
| 38 |
@@ -41,6 +41,8 @@ src_prepare() { |
| 39 |
-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ |
| 40 |
-e 's:/var/run:/run:g' \ |
| 41 |
conf.c doc/*.man.in examples/* || die |
| 42 |
+ |
| 43 |
+ default |
| 44 |
} |
| 45 |
|
| 46 |
src_configure() { |
| 47 |
@@ -89,7 +91,6 @@ src_configure() { |
| 48 |
|
| 49 |
src_compile() { |
| 50 |
emake all docs $(usex html '' 'ADOC=true') |
| 51 |
- |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
| 55 |
|
| 56 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
| 57 |
index 13709c0..b744729 100644 |
| 58 |
--- a/net-misc/chrony/chrony-9999.ebuild |
| 59 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
| 60 |
@@ -1,8 +1,8 @@ |
| 61 |
-# Copyright 1999-2015 Gentoo Foundation |
| 62 |
+# Copyright 1999-2016 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
# $Id$ |
| 65 |
|
| 66 |
-EAPI=5 |
| 67 |
+EAPI=6 |
| 68 |
inherit eutils git-r3 systemd toolchain-funcs |
| 69 |
|
| 70 |
DESCRIPTION="NTP client and server programs" |
| 71 |
@@ -12,7 +12,7 @@ LICENSE="GPL-2" |
| 72 |
SLOT="0" |
| 73 |
|
| 74 |
KEYWORDS="" |
| 75 |
-IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" |
| 76 |
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns" |
| 77 |
REQUIRED_USE=" |
| 78 |
?? ( libedit readline ) |
| 79 |
" |
| 80 |
@@ -20,11 +20,12 @@ REQUIRED_USE=" |
| 81 |
CDEPEND=" |
| 82 |
caps? ( sys-libs/libcap ) |
| 83 |
libedit? ( dev-libs/libedit ) |
| 84 |
+ pps? ( net-misc/pps-tools ) |
| 85 |
readline? ( >=sys-libs/readline-4.1-r4:= ) |
| 86 |
" |
| 87 |
DEPEND=" |
| 88 |
${CDEPEND} |
| 89 |
- sys-apps/texinfo |
| 90 |
+ html? ( dev-ruby/asciidoctor ) |
| 91 |
" |
| 92 |
RDEPEND=" |
| 93 |
${CDEPEND} |
| 94 |
@@ -39,7 +40,9 @@ src_prepare() { |
| 95 |
sed -i \ |
| 96 |
-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ |
| 97 |
-e 's:/var/run:/run:g' \ |
| 98 |
- conf.c chrony.texi.in examples/* || die |
| 99 |
+ conf.c doc/*.man.in examples/* || die |
| 100 |
+ |
| 101 |
+ default |
| 102 |
} |
| 103 |
|
| 104 |
src_configure() { |
| 105 |
@@ -73,7 +76,6 @@ src_configure() { |
| 106 |
${EXTRA_ECONF} \ |
| 107 |
--docdir=/usr/share/doc/${PF} \ |
| 108 |
--chronysockdir=/run/chrony \ |
| 109 |
- --infodir=/usr/share/info \ |
| 110 |
--mandir=/usr/share/man \ |
| 111 |
--prefix=/usr \ |
| 112 |
--sysconfdir=/etc/chrony \ |
| 113 |
@@ -88,26 +90,30 @@ src_configure() { |
| 114 |
} |
| 115 |
|
| 116 |
src_compile() { |
| 117 |
- emake all docs |
| 118 |
+ emake all docs $(usex html '' 'ADOC=true') |
| 119 |
} |
| 120 |
|
| 121 |
src_install() { |
| 122 |
default |
| 123 |
|
| 124 |
- doinfo chrony.info* |
| 125 |
- |
| 126 |
newinitd "${FILESDIR}"/chronyd.init-r1 chronyd |
| 127 |
newconfd "${FILESDIR}"/chronyd.conf chronyd |
| 128 |
|
| 129 |
insinto /etc/${PN} |
| 130 |
newins examples/chrony.conf.example1 chrony.conf |
| 131 |
|
| 132 |
+ docinto examples |
| 133 |
dodoc examples/*.example* |
| 134 |
|
| 135 |
+ if use html; then |
| 136 |
+ docinto html |
| 137 |
+ dodoc doc/*.html |
| 138 |
+ fi |
| 139 |
+ |
| 140 |
keepdir /var/{lib,log}/chrony |
| 141 |
|
| 142 |
insinto /etc/logrotate.d |
| 143 |
- newins "${FILESDIR}"/chrony-2.2.logrotate chrony |
| 144 |
+ newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony |
| 145 |
|
| 146 |
systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service |
| 147 |
systemd_enable_ntpunit 50-chrony chronyd.service |
Archives