gentoo resync : 23.03.2018

3 files changed, 126 insertions, 3 deletions

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 1ba7bcd45548..f8ae3812e46f 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -8,9 +8,11 @@ DIST chrony-2.3.tar.gz 355113 BLAKE2B 238269a79288186e93bd978bca1fb3258d35cfd72c
 DIST chrony-2.4.1.tar.gz 390641 BLAKE2B 7faac0c71f27bd3459f8a25b338e247744850128b32330fef324e37fd2e7cbd66156311e5a48140288580fc78f1948f8cf02fd2f64fc2ed3cabdaee28af5a67c SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d
 DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427
 DIST chrony-3.2.tar.gz 433882 BLAKE2B 4351cd22efbb2c819f09a562b2e0c1851336f8973b37b3015ec6acc04b925e13c1207262d4561318c187809bf989710d9a8fdf54e93b3d3dac56d0d6df8782df SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4
+DIST chrony-3.3-pre1.tar.gz 442045 BLAKE2B 122a36e46b5d5a3eb3e2d5e20ad2a5b4f419e496b9cd341e4895e6a4121f0c613860dba0375592ad169e3dbfdbdaf812f07124e6f3b005eba6b3296a663f601d SHA512 39bb4788d362d9aaf30b84c59eaf3421110c3776d57eb955f12d8fdd6013f8ffa91a6ff1e8b0018113f63d660570b1aa70d96f7c31faca29d5b720c2f3f1d625
 EBUILD chrony-2.3.ebuild 2724 BLAKE2B 57d4c8cb25615542f0b9e9a3678a71124982c1949bf8a78c71f649b706c60ac3ee5a61a17e27e3edee3eceeed1403532b324cb71e6bce4ef35ce1f230c98b29e SHA512 4509bb5db4d0f17fdb4951805b118fc044c0a79897b3b0d5522d0570cf95f6f37513dcace1b689e32127ea24a77567c3b14f7da91d9333c2fcaa76e4c2de0b24
 EBUILD chrony-2.4.1.ebuild 2817 BLAKE2B 524e7ee9f65cb867ebdf494cd93c839f28c0355aa221ddbe0a77cc981c25a255b5081f4b4b7c05813c6d8ae827cc7abb9ee08497bc66dbb987d6ef02f18644c6 SHA512 1bb4017e67ca5c2222a9bd6e113d2821f288fb20ddabbd7af08993ed694fb8a1a71fff260ae1718a0219ce76ae7d86521e7ab61326f5475394826dfe1550de75
-EBUILD chrony-3.1.ebuild 2827 BLAKE2B 5c2e20b5a57576c040b3b4db7e4edf94767575d0268fa5c46941a50f5936f517ff1e742c91528321021e64c0ee075cc59499b0c34bd8bd07b969ac6fdfbd4336 SHA512 199544f53f31464eb214b72ab16afa73212e4c2fceede8a4b578acad69f4600a3a56c3de2b9a4172c5b7a386a9401561a935f3d6e253025121cfdd64b9313c46
+EBUILD chrony-3.1.ebuild 2826 BLAKE2B 2c62fb404c1a7b1a48fa020666c0664c9026d420d0080cfcb981218fa83a56fb0e606cdc871b153f6702684e328fe656c0a9427f8fb6b377cfc81b95af607efa SHA512 dc91684d43a5e298a4596d7b641a07a4db4fdab690aa7d1eb667933d788abaeee1c8d0c5e64df4775401eda664bc223555f6c4519d68893fcb58cfc7aecce2ec
 EBUILD chrony-3.2.ebuild 2912 BLAKE2B de9d8eda478642e023ac95abc3009930644354ce75e145d989a003a61c1273ddb17e2a29255cab98199cc74c07553f866a85355b9255ed26a276abdbbaa08b34 SHA512 846d29b2b4fb9ff2c250a0d07a5b31ddba0e0c8e08ec625535ae7143f271f6f751a155768ddc91f474f75b677bf158709304b38c43e904a51220ca6f2b2bc612
+EBUILD chrony-3.3_pre1.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
 EBUILD chrony-9999.ebuild 2796 BLAKE2B 24f9468445a0b1bd820740c97d7d764825bdda4ce7e271a6e18ef48b05f5d692ead4d6f248dfbc5ab22373a6b06e106722faba7c8c1c42bd61e2d726b2c46997 SHA512 9d662c832a48613a7de249e4444cd0fc6f4440826e4d2cd0c6630927e8a1b179a21f341931899bb970addfb3c5b380738ac76f443dab665909d09925c5315f2a
 MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild
index 25f2e711b846..3ab518c67684 100644
--- a/net-misc/chrony/chrony-3.1.ebuild
+++ b/net-misc/chrony/chrony-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/chrony/chrony-3.3_pre1.ebuild b/net-misc/chrony/chrony-3.3_pre1.ebuild
new file mode 100644
index 000000000000..c3aed38aa99e
--- /dev/null
+++ b/net-misc/chrony/chrony-3.3_pre1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 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 ~sparc ~x86"
+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 )
+"
+
+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
+}