gentoo resync : 02.09.2020

5 files changed, 120 insertions, 88 deletions

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3aeed31b4c50..958d694219de 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,15 +3,15 @@ AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1
 AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 933a8fb5dc5225d86aa1a97083755607df76e767c38c58ead1e1ed5e4c180502b31edfbc8c045f976d0b511d60d35562b53d1f0a5ab0ba8b306843cd95b8a9f7 SHA512 e2be0c5cf68cd899a3fd15bf129e664e795883f9912b300e2a1fa0a01f7ca9faea32edd3f1232c9be91e629d5fbbc3a58ec793bf6a73108fa0e58e40c861a0c9
 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1
 AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640
-AUX chronyd.conf-r1 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414
+AUX chronyd.conf-r1 389 BLAKE2B e8048c21f025ea04478f824aee39d1e6f18e94845775e99d20a15a0f5dacf01e3c795eef8b3e52aecd544011dc957075f0ee1af125341d0ac52ef3f725f9f0f2 SHA512 7829f7766749f14de834f633b41483545f7a75e7a039daeef695da9268307957a483f42896ca7967ec98d393140b90e6868642eed43f6daa392c6e88d9871c08
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c
-DIST chrony-4.0-pre2.tar.gz 512765 BLAKE2B bfcac8564b05ed3cb6a67230746ec83d3f00192bd1d5e623ee12068bf3b7ca55e169a0228a13b62339be6a1c237199cd73186b1962ba51b445a56040560917fb SHA512 be3ca7c57c62c9ecf8d20d0b8d7b5a34ac455fb333be0587eabd5dfd7eebbcb3a3601ad161554a62098a9ca8d6530bee2900e9e7476bf477c3cb11907091dbd2
+DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
 EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a
 EBUILD chrony-3.5-r4.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6
-EBUILD chrony-3.5.1.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6
-EBUILD chrony-4.0_pre2-r1.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
-EBUILD chrony-9999.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
+EBUILD chrony-3.5.1-r1.ebuild 4846 BLAKE2B 4b07ee8134c845659bba38e0e1a69ee2a4395bfe2ccc930e694960cb0a1d7e1615f420aabca51842f015b9f4dd3969730a1d21cd7f627a6096b22eac8b579945 SHA512 8937a0924efc6f82c23c1e9089efff081b975ce59621cbb6f46adb73089e41793ef1d7d4d9c6ccdc677395d295a2d207426bf13df1e466acb734d3fd35c66ec3
+EBUILD chrony-4.0_pre3.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472
+EBUILD chrony-9999.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472
 MISC metadata.xml 1798 BLAKE2B c301fd829833515a78800677c498632a46ea968ad82f726b288ee3ec6bf79c733fcaea0b9a1777cf93e2a858da40beb105a301dca580e37e01b91111a38bdc17 SHA512 8609f9cb055d5de0a293cc78060101cbc30be4d3db6d7a8d751fa2bf416758e4c9d6509ce1890861c87d2e863e325051e68aadb4d621937f586e83ef585145e7
diff --git a/net-misc/chrony/chrony-3.5.1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
index fa28cf690097..ed8ec05dd522 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
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +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,27 +43,39 @@ RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 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
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
+
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
 
-	# Set config for privdrop
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -63,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -83,37 +102,46 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(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 samba --enable-ntp-signd '')
+		$(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"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 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_pre2-r1.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild
index 0338e59678bc..8ff387f448ec 100644
--- a/net-misc/chrony/chrony-4.0_pre2-r1.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
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +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,27 @@ 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/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 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
@@ -70,11 +63,19 @@ src_prepare() {
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
 
-	# Set config for privdrop
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -83,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -103,10 +102,11 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
@@ -116,6 +116,7 @@ src_configure() {
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
@@ -124,14 +125,15 @@ src_configure() {
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 0338e59678bc..8ff387f448ec 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
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +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,27 @@ 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/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 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
@@ -70,11 +63,19 @@ src_prepare() {
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
 
-	# Set config for privdrop
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -83,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -103,10 +102,11 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
@@ -116,6 +116,7 @@ src_configure() {
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
@@ -124,14 +125,15 @@ src_configure() {
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1
index c04f3525f0b7..2783f29e6844 100644
--- a/net-misc/chrony/files/chronyd.conf-r1
+++ b/net-misc/chrony/files/chronyd.conf-r1
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf"
 # The combination of "-s -r" allows chronyd to perform long term averaging of
 # the gain or loss rate across system reboots and shutdowns.
 
-ARGS="-u ntp -F 1"
+ARGS="-u ntp -F 0"