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

[Jeroen Roovers]

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