Version bump.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 102 insertions, 22 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index d2aaa9ff2906..c1837aab92c3 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.91 2013/01/26 17:48:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.92 2013/02/04 12:27:46 jer Exp $
+
+*chrony-1.27 (04 Feb 2013)
+
+  04 Feb 2013; Jeroen Roovers <jer@gentoo.org> -chrony-1.27_pre1.ebuild,
+  +chrony-1.27.ebuild, +files/chronyd.init, metadata.xml:
+  Version bump.
 
   26 Jan 2013; Jeroen Roovers <jer@gentoo.org> chrony-1.26.ebuild,
   chrony-1.27_pre1.ebuild:
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3bf8dfb4bd21..5badff96eb53 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,17 +3,18 @@ Hash: SHA256
 
 AUX chrony.logrotate 287 SHA256 abe2e7177d5041e9b3d0d939db72e208bccef23405c190fdd951a8560f3a621c SHA512 641b9f8bc4abce90de2abe3f7ac8ee47ad3779c971c95e7273a904b1f984c42adc32d943e8e32667e50748022257f577067bc8c0c1ec768d0cb932a413c84d95 WHIRLPOOL c0444d9018564f43ac16de35a6f5bfb8b809b0446b4f7ad50da77a6309bf7715919885afe8e6c7cc8fd73b387eecb7cbabdf84878e0b79b22ca91a0a81dd9354
 AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 WHIRLPOOL 14e6e90959e434475f8d74a144fd342588e99a7102b15cedbf7a436ca32db3e09bbe4bd2630634fac9045db4b75a6c7afcd8f91c67bd8bb4f977d821d220ced9
+AUX chronyd.init 1739 SHA256 82a49a66f8d6db492ca14cc685535a395b8018230aedb09ee3ad3a476fe752d5 SHA512 7c56c55a741a9a7f4d4562418a143fd0f7108d4821641ccc536c20f9878d6c0e246ef7af33c4aa404d696dbb3d75dfcd3279def1e650c3e7f16ec0b7f69b71e4 WHIRLPOOL 761b3405a0308a61999a25c2a1a0d57bf718a5d23a1ca86e25ac3b663df79c27597a3969d7dbeeed3cba9f657c44fa42cedf59394b79a9a0f37e83308fe58089
 AUX chronyd.rc 1744 SHA256 3c15c635e656c1f83846270813754863033e996bed144f82bdbf65a2e5dd3aa5 SHA512 94c30af18e803d45222001ac7cfc5bbfdf652497c5a0e4caa28decaefea4ea8aaeab81d11ddc05bfd16918e65aa0bce4e6c000d598b489c944060e91c12ddb34 WHIRLPOOL d2637e1e416c6685c9f2b152afc1550c65387babca6b74363ed26f9b32fb0c2e7986926d90af268a8d06904f24ad321a7344b0c2a64d3a1f30da9a4ffdbc4559
 DIST chrony-1.26.tar.gz 381475 SHA256 fb191ca4ba59e192c96d022618ca3eaee49f3c11f9af8dd7297020b27bf3e05b SHA512 6fe3d591eac13d5bf410e377212e3c0848fc0215301c1f6450c3934f20b6e5c21ee75f0ed0fd6798927c053ba2bc53ac4c44875d6517f1f452174c6bba62a4d0 WHIRLPOOL 49c962e0bb02fed6f35c0a36d940fd762fb46a4b4ebc2ce3aac7e8f9190a76603055f5a4bbf862f273b1764183e5c60bad0b61e816da1801cff8e9d720a637fb
-DIST chrony-1.27-pre1.tar.gz 392415 SHA256 4d2552a22f59a872214452fa7b61313d7a0c31e3e4f10921d90278c222403931 SHA512 c2c5fb30d5347d876e17ee329ed9bae5e7488f599848ada32fded41a457e1e564c70e5956ea3cdd6b636306ba89c7779f87fd0854ca25a37cfff2d12186c331e WHIRLPOOL afd74a76f8ab0f4196edcc700a30f03bef6d488ab47d723894dfccaa49f7c757f1e19b0a6d7086a7174d01b8397a1f6dd87fe50fc3c1157a5595c833b8e6a513
+DIST chrony-1.27.tar.gz 392876 SHA256 d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d SHA512 20270ba1aa009e2d12f1c98c32bcbd2e8fdf15a8d4285e2eaf98c91ac21af9d7b75db90985c1c7400c7673c934d1792ad877a11e0dbafc22bdd24d77b27b431c WHIRLPOOL 2851096ebc19e6a56b54d8136768dfc0b3abcca64c39b949b3752de3459600eafce5e7fe4161dc3bdda61a8686e4bd74efdebb673b6465e060c563191e501606
 EBUILD chrony-1.26.ebuild 1639 SHA256 ac497a3f749ec0ac3e7e745a07af84cf3a618c77111a8aabc98fb67d5abf6a15 SHA512 59b30e22cccdd8fca18b91809985db3070dbcf8c1d0f3ee71ce9e4f9c4fce9560dbf1802f57a947cff25db8d1762edac8d8deb728fec8e52a694114cec8c7a56 WHIRLPOOL d836e3231342a4cc779763223fcb5ef99520182b352f23747281aab26191d2d39b703ae933d32335db1b6067ae40deb7918053ec978f7970bd8e322a78aa644c
-EBUILD chrony-1.27_pre1.ebuild 1579 SHA256 34fc136dc12e864a1d46220b97bf3faf61895033cde31531b9f2b86cef927a0d SHA512 6a36eb717f7383952674cb89f7454b767d205d5167b86b23da4a72f4a6778a97e329c86615c94e440a04c87396cef3afcb09a5e74ff2a0ab2182a9bf79341c43 WHIRLPOOL a9e2dcdc73f4bd3da3a82648e989a4afcae2c6f38b5142edc42d032d87c7e2ff0d9dbc973e33aaba9f58fde44209e143902a8a42e4f8d401eeac6de4826b022c
-MISC ChangeLog 11560 SHA256 9cdb3c92899146a74ff80ba6cff7e6f4f25ec28cc6cb1abaf5e5d4f9d77a7138 SHA512 eb2939e3ad4c900398a3ea3e6acea3ab386901e9c714bacdb181aed4aea324733210290bfcd2355f75f4618c3504f5f200cb6c3491cb190d9e9a480d7055a69f WHIRLPOOL 84442d79d1f8c2cecfc221ada1b3cf99ae752831da55442fa05e959440052771ea710e1c4126209cd31563b8c10acb9a8a4a3d2bb5e61ce81723323fe5849d2a
-MISC metadata.xml 993 SHA256 1247667e05172ee528085e5f269c86e4bc52a47e49e9114926138b5bc0effcd0 SHA512 a1d1d8bd03f0e853f07e01f15e4c9e4510a1c6c14211764c91fc86aa3fcf302d31ffd717d67303323f3961614ba91e71bf1cee724c0456100a8133bfca084903 WHIRLPOOL 563dbffe7526282fa1a8a5df18debb920491430f44e78c432cba066d693b8615822bdfb594154157ba9e2f1bcef9bc9787335997e3ece8911dc9eb960d149efd
+EBUILD chrony-1.27.ebuild 1710 SHA256 0faed2361d22942e60beef6627389ad503dd34c7871e8f3274701c9267d450b5 SHA512 3628a6ee744fd5825010aeec13434875aa511c141bb7e53b4c1eee2f830fd33cdea1e38f2d4d07a66ccb3a10ec730cb2157920be34aaead39415c0040b1089ca WHIRLPOOL ea03aa5b341b8e18c9ac913b5d01e7b12f2157eb30edf5f85a898ba48a3d9a18cf48849a07cb7ce1d101237d33476fe526358b85860f481220c9775e8b906462
+MISC ChangeLog 11736 SHA256 c66f49ed9b5617de5ef2beb6782d517391a6a93497cc2b37445ef57654073df2 SHA512 a4096431219a2c2e7254ad340d404146481389055f3c16fa754587a7a512084589eae55d8ff64550ea10adf5cfad3333f513fe5dee9d0c1534924339769cbc96 WHIRLPOOL 3af1a7c521d0bc9fd27c4d4fcc021c5bb4107e7643f2e15af84f275d31000ec91c058849d8d0d9aa50cf899bc43981bf2992f1fa00cc4c9b4e076faea4b6c94d
+MISC metadata.xml 1086 SHA256 18d59935890367a9bbe405207a32ba70aa57304075efc6814bda5128ec226d8d SHA512 2674fcc6a9d454544dcfea5002a93ec6ad9b107651d11f2d75d6d187fffa4502cb9ea1bcd3fc2a6e7dbf07b9b18e928534c0c442fbb01abff1660d726f3cd0c2 WHIRLPOOL e21367e6d4fd6a02a8bc56546c90b80fee2d5c5c9160a0f9ff6b6896babc3e7e956a0ad525adaf6fc22b16e12f1570f0f5528bdc47ee8913031b70e2757b3797
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEEFt0ACgkQVWmRsqeSphPzlACePU6DYACuO6Hclfni/4XZnKSf
-TpMAnA4EPSmkg6gKBi1fjhK2XSXThXV5
-=jd1s
+iEYEAREIAAYFAlEPqUkACgkQVWmRsqeSphPfAgCeP/RDALv207fqK2pqUPaQdbaO
+S6sAnjoNm10C+V3xPnJCoXvae4plNOgF
+=JYG2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.27_pre1.ebuild b/net-misc/chrony/chrony-1.27.ebuild
index a3c5f3740e8f..1ea1cdab39ad 100644
--- a/net-misc/chrony/chrony-1.27_pre1.ebuild
+++ b/net-misc/chrony/chrony-1.27.ebuild
@@ -1,33 +1,35 @@
 # 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.27_pre1.ebuild,v 1.4 2013/01/26 17:48:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.27.ebuild,v 1.1 2013/02/04 12:27:46 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils toolchain-funcs
 
-MY_P="${P/_/-}"
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${MY_P}.tar.gz"
+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"
+IUSE="caps ipv6 +readline +rtc"
 
-RDEPEND="
-	readline? ( >=sys-libs/readline-4.1-r4 )
+DEPEND="
 	caps? ( sys-libs/libcap )
+	readline? ( >=sys-libs/readline-4.1-r4 )
 "
-DEPEND="${RDEPEND}"
-DOCS=( examples/chrony.{conf,keys}.example )
+RDEPEND="${REPEND}"
 
-S="${WORKDIR}/${MY_P}"
+DOCS=( examples/chrony.{conf,keys}.example )
 
 src_prepare() {
-	sed -i examples/* chrony*.{1,5,8} faq.txt chrony.texi \
-		-e "s:/etc/chrony\.:/etc/chrony/chrony.:g" \
-		|| die
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		examples/* chrony*.{1,5,8} faq.txt chrony.texi || die
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi chrony.txt \
+		examples/chrony.conf.example || die
 }
 
 src_configure() {
@@ -38,6 +40,7 @@ src_configure() {
 		$( use caps		 || echo --disable-linuxcaps ) \
 		$( use ipv6		 || echo --disable-ipv6 ) \
 		$( use readline	 || echo --disable-readline ) \
+		$( use rtc		 || echo --disable-rtc ) \
 		${EXTRA_ECONF} \
 		--docdir=/usr/share/doc/${PF} \
 		--infodir=/usr/share/info \
@@ -45,6 +48,7 @@ src_configure() {
 		--prefix=/usr \
 		--sysconfdir=/etc/chrony \
 		--without-nss \
+		--without-tomcrypt \
 		|| die
 }
 
@@ -57,7 +61,7 @@ src_install() {
 	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 	doinfo chrony.info*
 
-	newinitd "${FILESDIR}"/chronyd.rc chronyd
+	newinitd "${FILESDIR}"/chronyd.init chronyd
 	newconfd "${FILESDIR}"/chronyd.conf chronyd
 
 	keepdir /var/{lib,log}/chrony /etc/chrony
diff --git a/net-misc/chrony/files/chronyd.init b/net-misc/chrony/files/chronyd.init
new file mode 100644
index 000000000000..c06a82288c27
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.init,v 1.1 2013/02/04 12:27:46 jer Exp $
+
+depend() {
+	use dns
+}
+
+checkconfig() {
+	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
+	# is because the user may have specified another key
+	# file, and we don't want to force the user to use that
+	# exact name for the key file.
+	if [ ! -f "${CFGFILE}" ] ; then
+		eerror "Please create ${CFGFILE} and the"
+		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+		eerror "by using the"
+		eerror ""
+		eerror "        chrony.conf.example"
+		eerror "        chrony.keys.example"
+		eerror ""
+		eerror "files (from the documentation directory)"
+		eerror "as templates."
+		return 1
+	else
+		# Actually, I tried it, and chrony seems to ignore the pidfile
+		# option. I'm going to leave it here anyway, since you never
+		# know if it might be handy
+		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+	fi
+	return 0
+}
+
+setxtrarg() {
+	if [ -c /dev/rtc ]; then
+		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+	fi
+	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	setxtrarg
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Starting chronyd"
+	start-stop-daemon --start --background --quiet \
+		--exec /usr/sbin/chronyd \
+		--pidfile "${PIDFILE}" \
+		-- -f "${CFGFILE}" ${ARGS}
+	eend $? "Failed to start chronyd"
+}
+
+stop() {
+	checkconfig || return $?
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Stopping chronyd"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PIDFILE}"
+	eend $? "Failed to stop chronyd"
+}
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 30272d794b17..10fecd3edce8 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -17,4 +17,7 @@ Chrony はコンピュータのシステム・クロックの精度を保つた�
 接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
 な接続でも機能します。
 </longdescription>
+<use>
+<flag name='rtc'>Include support for the Linux Real Time Clock interface</flag>
+</use>
 </pkgmetadata>