Improve unit file (#483456 by Stefan G. Weichinger)

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 101 insertions, 5 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 1093df8c066d..6fac176fc953 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.113 2013/08/28 12:25:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.114 2013/09/21 15:20:56 pacho Exp $
+
+*chrony-1.29-r1 (21 Sep 2013)
+
+  21 Sep 2013; Pacho Ramos <pacho@gentoo.org> +chrony-1.29-r1.ebuild,
+  +files/chronyd.service-r1:
+  Improve unit file (#483456 by Stefan G. Weichinger)
 
   28 Aug 2013; Jeroen Roovers <jer@gentoo.org> -chrony-1.27-r1.ebuild,
   -files/chronyd.rc:
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 787bc3988acf..93820a6588e0 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -6,14 +6,16 @@ AUX chrony.logrotate 287 SHA256 abe2e7177d5041e9b3d0d939db72e208bccef23405c190fd
 AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 WHIRLPOOL 14e6e90959e434475f8d74a144fd342588e99a7102b15cedbf7a436ca32db3e09bbe4bd2630634fac9045db4b75a6c7afcd8f91c67bd8bb4f977d821d220ced9
 AUX chronyd.init 1739 SHA256 82a49a66f8d6db492ca14cc685535a395b8018230aedb09ee3ad3a476fe752d5 SHA512 7c56c55a741a9a7f4d4562418a143fd0f7108d4821641ccc536c20f9878d6c0e246ef7af33c4aa404d696dbb3d75dfcd3279def1e650c3e7f16ec0b7f69b71e4 WHIRLPOOL 761b3405a0308a61999a25c2a1a0d57bf718a5d23a1ca86e25ac3b663df79c27597a3969d7dbeeed3cba9f657c44fa42cedf59394b79a9a0f37e83308fe58089
 AUX chronyd.service 198 SHA256 530a95ce8688c14b210aac3d910be4428dd4983930789aa78b73b25bc2233235 SHA512 9382e0e1956f2d3d83e44a5bd00f4ba8dd700a0ba11e66522eba2badfcb0b1cae1cc0b302ff53918a620f298e464751a58ad9cbf32f2c75b88d7918978f57edd WHIRLPOOL 6bdad1afa9ab23c1fe6c1b5c750a9d04e784f1f059891dcc35116d1633ee88134e1b544c876c363b21d1f8fe8ff88587a51e741df30501b163bbb5476a60e4f9
+AUX chronyd.service-r1 225 SHA256 378d7d98f3eb46c58c8b51f3702c3f8b56332c71fa3f8bab5995260a88520658 SHA512 31b79e3e63c43cd065c6259fe54536e920bb29e7429549e52a9e17b5ec2a68c425c0a7c1195cb36481814ad22513205929605c3c66bb6c2cb95e2fefe295bc51 WHIRLPOOL e45188b8360da9294b7d04160c5870f586dd8006ff88e5961cac886f5d830812bcb000e11f7a8ca82e7c2ff6807416a424046d6e411388ea5050590170ee44c8
 DIST chrony-1.29.tar.gz 392880 SHA256 c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b SHA512 bea384e098a7ea3862e49b31ee85959ae1d23af3a095dd34dbfc6e52329dc9404ff2ca9d0e01eb12ea79d2f5ab484a67f025c152a374bc6bd0e3a803a3bec93e WHIRLPOOL 78850ecb37df1c2c8c75837b7e38d9fa907249d9a5df8fd0f1891d19d40280448ff34b0bd63bcdf3426b102768e6a18f40ddde1a3f38f69334a8f5d480144595
+EBUILD chrony-1.29-r1.ebuild 1830 SHA256 5d62e5cc6fb29ad72bf3f9f77833fc420c34cf8ce352e984c23191fe2be4b9ce SHA512 b7605973a00ff188d73b7ac55324087bfca31633a79ee882cce86ef4d6f337e8f9ecf0ab4b8289bc9212dded603fba8346075d7300ce8cd9e392854522c37df5 WHIRLPOOL 83e9bae186526aa7d643226342a262e74933ca9f44fd6e9c7a999897a490fa9c63d4a8f8997afb72fa60b121601d18f6cef70fc660c52a0c084e5e72f2945af9
 EBUILD chrony-1.29.ebuild 1800 SHA256 ae592603ab8d2e09c86e31a60d63bc5d640647324619c923e1bdf66dad2944ec SHA512 c6de0b22b1da2105cb5407cb52d57981e3b1fe7aae7c82131f60839a2f98a9bad5a131b2b384cacb4711813161022cfbab296439b281d662213951a2b67742e8 WHIRLPOOL 469e21b180af8677fd34247613922375908787a18374701829bb91f120abd4a4d65c93a67df99adf3c0041e15339af47eaac97f0ba8b1bf253e03d09b1e9c74e
-MISC ChangeLog 14215 SHA256 7839eec01e9763b606b18a24994ffd18ff0079c0fe2c1b73400c7ab684cd1451 SHA512 a5f3ceca7ba81523a40b82aa8857e54f52aea1b5f91e2b048e478c62b8a3e364cd789e4a7c98ac62022ffb675a0ea1ab12fe6d90b9d59fc5553af27d1d9e3444 WHIRLPOOL ada9d15063dd92e81b206a04a9e17d88d37e379bbd7d05ad3b7e07c21d6524e71a848a0650fd86be56c08bf1efe1868f57a0ddf32f1e346fb982510c4bf929c6
+MISC ChangeLog 14402 SHA256 641c9e2749eac99c221eef6522838add284e159b5db4133364be3b02cd8f3478 SHA512 05d90c1f1eed7a11c06fde442406b97e4e1a5e9a3f8306492ae41b3e4d1cae10b76abe1a8d8f2042ccb29d4c368b1a3df5daa2082cfb69868815187a600b023e WHIRLPOOL 386bd492b9846b0a183b523bae62c60e566cea3d72a3d861b22705dba603ababe0a4cc9f7e1f1303293d05c3db60ed35f71113bac8fbcb1aa1e30305f513c920
 MISC metadata.xml 1086 SHA256 18d59935890367a9bbe405207a32ba70aa57304075efc6814bda5128ec226d8d SHA512 2674fcc6a9d454544dcfea5002a93ec6ad9b107651d11f2d75d6d187fffa4502cb9ea1bcd3fc2a6e7dbf07b9b18e928534c0c442fbb01abff1660d726f3cd0c2 WHIRLPOOL e21367e6d4fd6a02a8bc56546c90b80fee2d5c5c9160a0f9ff6b6896babc3e7e956a0ad525adaf6fc22b16e12f1570f0f5528bdc47ee8913031b70e2757b3797
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlId7CQACgkQVWmRsqeSphPpNgCcDZfyLL50LQVA1xP4wFlVMcYg
-UjAAnjR2Y4gF7nG6dl5gNcVixPnQwVdV
-=GWPp
+iEYEAREIAAYFAlI9uVkACgkQCaWpQKGI+9QtVgCfXuf4pD19UcLy2oHgq06iRziu
+MpMAni53wv0z4invZazR7Ktuc7W95doF
+=6Tj6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.29-r1.ebuild b/net-misc/chrony/chrony-1.29-r1.ebuild
new file mode 100644
index 000000000000..e0ce7aaa165b
--- /dev/null
+++ b/net-misc/chrony/chrony-1.29-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.29-r1.ebuild,v 1.1 2013/09/21 15:20:56 pacho Exp $
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="caps ipv6 +readline +rtc"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	readline? ( >=sys-libs/readline-4.1-r4 )
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+S="${WORKDIR}/${P/_/-}"
+DOCS=( examples/chrony.{conf,keys}.example )
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in chrony.txt examples/* faq.txt || die
+}
+
+src_configure() {
+	tc-export CC
+
+	# not an autotools generated script
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex readline '' --disable-readline) \
+		$(usex rtc '' --disable-rtc) \
+		--docdir=/usr/share/doc/${PF} \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--without-nss \
+		--without-tomcrypt \
+		${EXTRA_ECONF} \
+		|| die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	keepdir /var/{lib,log}/chrony /etc/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony.logrotate chrony
+
+	# systemd stuff
+	systemd_newunit "${FILESDIR}"/chronyd.service-r1 chronyd.service
+	insinto $(systemd_get_utildir)/ntp-units.d/
+	doins "${FILESDIR}"/50-chrony.list
+}
diff --git a/net-misc/chrony/files/chronyd.service-r1 b/net-misc/chrony/files/chronyd.service-r1
new file mode 100644
index 000000000000..49e40882c3fc
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.service-r1
@@ -0,0 +1,11 @@
+[Unit]
+Description=Chrony Network Time Service
+After=ntpdate.service sntp.service network.target
+Conflicts=ntpd.service
+
+[Service]
+ExecStart=/usr/sbin/chronyd -r -s -d
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target