From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1200170-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 DDD8E13835A
for <garchives@archives.gentoo.org>; Thu, 27 Aug 2020 10:04:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B669CE0C9E;
Thu, 27 Aug 2020 10:04:52 +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 8B9DEE0C9E
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2020 10:04:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 F2B0733BDFF
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2020 10:04:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B9F2324
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2020 10:04:49 +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: <1598522687.d0bf878e486f614320edca97d8a020f47c7480dd.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-3.5.1-r1.ebuild net-misc/chrony/chrony-3.5.1.ebuild net-misc/chrony/chrony-4.0_pre3.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: d0bf878e486f614320edca97d8a020f47c7480dd
X-VCS-Branch: master
Date: Thu, 27 Aug 2020 10:04:49 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ba707bb3-eb83-455e-ad1a-dee808415a2c
X-Archives-Hash: 25575234e7ab3aec60cd4923ea8b094f
commit: d0bf878e486f614320edca97d8a020f47c7480dd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 09:04:49 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 10:04:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bf878e
net-misc/chrony: Add IUSE=sechash in 3.5.1, fix whitespace
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
...{chrony-3.5.1.ebuild => chrony-3.5.1-r1.ebuild} | 40 +++++++++++++++-------
net-misc/chrony/chrony-4.0_pre3.ebuild | 26 +++++---------
net-misc/chrony/chrony-9999.ebuild | 24 ++++---------
3 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/net-misc/chrony/chrony-3.5.1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
similarity index 86%
rename from net-misc/chrony/chrony-3.5.1.ebuild
rename to net-misc/chrony/chrony-3.5.1-r1.ebuild
index 067eb1c8836..84346525f5c 100644
--- a/net-misc/chrony/chrony-3.5.1.ebuild
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild
@@ -6,22 +6,31 @@ inherit systemd tmpfiles toolchain-funcs
DESCRIPTION="NTP client and server programs"
HOMEPAGE="https://chrony.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
LICENSE="GPL-2"
SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="
- +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
- +seccomp selinux
+ +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline
+ +refclock +rtc +seccomp +sechash selinux
"
REQUIRED_USE="
?? ( libedit readline )
+ sechash? ( nettle )
"
-
+RESTRICT=test
CDEPEND="
caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
libedit? ( dev-libs/libedit )
+ nettle? ( dev-libs/nettle:= )
readline? ( >=sys-libs/readline-4.1-r4:= )
seccomp? ( sys-libs/libseccomp )
"
@@ -34,18 +43,19 @@ RDEPEND="
${CDEPEND}
selinux? ( sec-policy/selinux-chronyd )
"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
)
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+ BDEPEND=" virtual/w3m"
+fi
src_prepare() {
default
+
sed -i \
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
doc/* examples/* || die
@@ -90,15 +100,16 @@ src_configure() {
$(usex caps '' --disable-linuxcaps)
$(usex cmdmon '' --disable-cmdmon)
$(usex ipv6 '' --disable-ipv6)
+ $(usex nettle '' --without-nettle)
$(usex ntp '' --disable-ntp)
$(usex phc '' --disable-phc)
$(usex pps '' --disable-pps)
$(usex refclock '' --disable-refclock)
$(usex rtc '' --disable-rtc)
+ $(usex sechash '' --disable-sechash)
${CHRONY_EDITLINE}
${EXTRA_ECONF}
--chronysockdir="${EPREFIX}/run/chrony"
- --disable-sechash
--docdir="${EPREFIX}/usr/share/doc/${PF}"
--mandir="${EPREFIX}/usr/share/man"
--prefix="${EPREFIX}/usr"
@@ -114,6 +125,11 @@ src_configure() {
}
src_compile() {
+ if [[ ${PV} == "9999" ]]; then
+ # uses w3m
+ emake -C doc man txt
+ fi
+
emake all docs $(usex html '' 'ADOC=true')
}
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild
index 5535a1b2ea7..84346525f5c 100644
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild
+++ b/net-misc/chrony/chrony-4.0_pre3.ebuild
@@ -18,21 +18,15 @@ fi
LICENSE="GPL-2"
SLOT="0"
-
IUSE="
- +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
- +seccomp +sechash selinux
+ +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline
+ +refclock +rtc +seccomp +sechash selinux
"
-
REQUIRED_USE="
?? ( libedit readline )
sechash? ( nettle )
"
-
RESTRICT=test
-
-BDEPEND=""
-
CDEPEND="
caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
libedit? ( dev-libs/libedit )
@@ -40,28 +34,24 @@ CDEPEND="
readline? ( >=sys-libs/readline-4.1-r4:= )
seccomp? ( sys-libs/libseccomp )
"
-
DEPEND="
${CDEPEND}
html? ( dev-ruby/asciidoctor )
pps? ( net-misc/pps-tools )
"
-
RDEPEND="
${CDEPEND}
selinux? ( sec-policy/selinux-chronyd )
"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" virtual/w3m"
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
)
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+ BDEPEND=" virtual/w3m"
+fi
src_prepare() {
default
@@ -76,7 +66,6 @@ src_prepare() {
}
src_configure() {
-
# Set config for privdrop
if ! use caps; then
sed -i \
@@ -89,6 +78,7 @@ src_configure() {
-e 's/-F 1//' \
"${T}"/chronyd.conf "${T}"/chronyd.service || die
fi
+
tc-export CC
local CHRONY_EDITLINE
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index a2dcdd4d2bd..84346525f5c 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -18,21 +18,15 @@ fi
LICENSE="GPL-2"
SLOT="0"
-
IUSE="
- +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
- +seccomp +sechash selinux
+ +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline
+ +refclock +rtc +seccomp +sechash selinux
"
-
REQUIRED_USE="
?? ( libedit readline )
sechash? ( nettle )
"
-
RESTRICT=test
-
-BDEPEND=""
-
CDEPEND="
caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
libedit? ( dev-libs/libedit )
@@ -40,28 +34,24 @@ CDEPEND="
readline? ( >=sys-libs/readline-4.1-r4:= )
seccomp? ( sys-libs/libseccomp )
"
-
DEPEND="
${CDEPEND}
html? ( dev-ruby/asciidoctor )
pps? ( net-misc/pps-tools )
"
-
RDEPEND="
${CDEPEND}
selinux? ( sec-policy/selinux-chronyd )
"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" virtual/w3m"
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
)
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+ BDEPEND=" virtual/w3m"
+fi
src_prepare() {
default