net-misc/chrony: version bump to 3.2

3 files changed, 2 insertions, 127 deletions

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 9abc12e0..c2e0ce79 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,8 +3,6 @@ AUX chrony-3.2-no-glob_magic.patch 404 SHA256 0e85df5fcc6138ea67636a9f0295efd6ec
 AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 WHIRLPOOL 14e6e90959e434475f8d74a144fd342588e99a7102b15cedbf7a436ca32db3e09bbe4bd2630634fac9045db4b75a6c7afcd8f91c67bd8bb4f977d821d220ced9
 AUX chronyd.init-r1 1637 SHA256 f3c8b8dfbb1ee14b251d3502cb799411aa4fb71d107ddd90b41b4841eee22f5c SHA512 cbfafe8210cc3d86d417d590fa6c54924ef9f3487c3766a17fffb34d2421a5fc2dfb98ce53dcc33c5811e7c2fd428a235bfde68d999cb50c7d9e5100f769a37b WHIRLPOOL d1b31217ede912611bf7aec69a37d4321913cff0e41f8dfe1df1ff1a6605fd21bbfbdced53ea6e9dc0a22ff5848fe0b705ddf0a6b0e5154ddd4e9b6ed1fe656a
 AUX chronyd.service-r2 261 SHA256 d5996c6b8596e137b36099d0ce7974bfd8e36411d999712d2f0393ac738f3754 SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe WHIRLPOOL f95d9472ad30fb06e3d0014ddc2be492dd1a6d2b5590bed27214ba1b0566d83e89e108a8df3de9dade939a9feff005bfff431d796f9e813388830e3f3dfc437b
-DIST chrony-3.2-pre1.tar.gz 431211 SHA256 3c6fa2fe71ba670955498dcecab6a57c0b4ed8bc5a761629e96cd6038946942f SHA512 8ce54f246c3e11e72d90ba03e6f39894445eed314b26113c4a98b5746a00c1886291bf1bb20db68318c3310350b36ea6c88fe05607ae82e551ee93aea6e3fcb6 WHIRLPOOL 1fdf2b0d66b048b448e184b947416bd5ac10996633a41b77749f787ac88b2e605925174483ba8b52f398a1adc8c79b56a2c75d759d187066981dad8045c32eb2
-DIST chrony-3.2-pre2.tar.gz 433579 SHA256 8fe90b486e33909c22362ad524701470cd119618013d10e6bc750edca0cb5fbd SHA512 ddc1008da21ee995bfc6049e713f79e9872a3c45d26867b763c41914000bcc5c016c968588d00f85547405bb0bc7950c5954b5757ef08edef8adf988c711546a WHIRLPOOL e4e52c1b5b08824acfae22f554aee464c6d642bd007f6a979fa89c931b7dfa848ec67798ab71c9e1e87cb9570521ad0278671af3ce420255a08b31b6574b1323
-EBUILD chrony-3.2_pre1.ebuild 2958 SHA256 15b6207d43ca1de44d3369d7e2730096f536f6881fe950531acfd7f74c4a1521 SHA512 e83a6d0a53c86d47613432c03f9cd7ef5f825ee3728667bd44cf14f80d667c7384c1abd3e7a8864dafa3a1ecc7cc83c7381a71a5591a3ac14a4b913acc06ddde WHIRLPOOL 582e8e29e71e6dc2a6c02e1ad6db7031ff06e22b004a730b3083aa32c08cd1f8771e603d401076356a08d2c301baa3e4399be608d832fc7a2ab59bd3e2bd79b4
-EBUILD chrony-3.2_pre2.ebuild 2958 SHA256 15b6207d43ca1de44d3369d7e2730096f536f6881fe950531acfd7f74c4a1521 SHA512 e83a6d0a53c86d47613432c03f9cd7ef5f825ee3728667bd44cf14f80d667c7384c1abd3e7a8864dafa3a1ecc7cc83c7381a71a5591a3ac14a4b913acc06ddde WHIRLPOOL 582e8e29e71e6dc2a6c02e1ad6db7031ff06e22b004a730b3083aa32c08cd1f8771e603d401076356a08d2c301baa3e4399be608d832fc7a2ab59bd3e2bd79b4
+DIST chrony-3.2.tar.gz 433882 SHA256 329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116 SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4 WHIRLPOOL b8a9045c81970653393c2afadece1e3a5e093c893b7ac3bae061bbd40bc043439e426df8da6598e36ef9589b4dd402419199307a9bfa48df526206952814667e
+EBUILD chrony-3.2.ebuild 2958 SHA256 15b6207d43ca1de44d3369d7e2730096f536f6881fe950531acfd7f74c4a1521 SHA512 e83a6d0a53c86d47613432c03f9cd7ef5f825ee3728667bd44cf14f80d667c7384c1abd3e7a8864dafa3a1ecc7cc83c7381a71a5591a3ac14a4b913acc06ddde WHIRLPOOL 582e8e29e71e6dc2a6c02e1ad6db7031ff06e22b004a730b3083aa32c08cd1f8771e603d401076356a08d2c301baa3e4399be608d832fc7a2ab59bd3e2bd79b4
 MISC metadata.xml 1566 SHA256 df519c8729414da92dabce3e6fcfd98e7cbee2c3ca31c1271d280d63f39cfdc2 SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84 WHIRLPOOL 12b3b29c032ba953e7d945d5a7cc1264e03468fe0c9c7201bc0cc82a1927c253856f714fcce957dc74eb95f23457265ac3e08925b9a4a3530e5a710d93275c96
diff --git a/net-misc/chrony/chrony-3.2_pre1.ebuild b/net-misc/chrony/chrony-3.2.ebuild
index 24347f58..24347f58 100644
--- a/net-misc/chrony/chrony-3.2_pre1.ebuild
+++ b/net-misc/chrony/chrony-3.2.ebuild
diff --git a/net-misc/chrony/chrony-3.2_pre2.ebuild b/net-misc/chrony/chrony-3.2_pre2.ebuild
deleted file mode 100644
index 24347f58..00000000
--- a/net-misc/chrony/chrony-3.2_pre2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64"
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
-REQUIRED_USE="
-	?? ( libedit readline )
-"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	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 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-no-glob_magic.patch  )
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	sed -i \
-		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-		-e 's:/var/run:/run:g' \
-		conf.c doc/*.man.in examples/* || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
-	# not an autotools generated script
-	local CHRONY_CONFIGURE="
-	./configure \
-		$(use_enable seccomp scfilter) \
-		$(usex adns '' --disable-asyncdns) \
-		$(usex caps '' --disable-linuxcaps) \
-		$(usex cmdmon '' --disable-cmdmon) \
-		$(usex ipv6 '' --disable-ipv6) \
-		$(usex ntp '' --disable-ntp) \
-		$(usex phc '' --disable-phc) \
-		$(usex pps '' --disable-pps) \
-		$(usex refclock '' --disable-refclock) \
-		$(usex rtc '' --disable-rtc) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
-		--chronysockdir=/run/chrony \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--disable-sechash \
-		--without-nss \
-		--without-tomcrypt
-	"
-
-	# print the ./configure call to aid in future debugging
-	einfo ${CHRONY_CONFIGURE}
-	bash ${CHRONY_CONFIGURE} || die
-}
-
-src_compile() {
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	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.4-r1.logrotate chrony
-
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}