Old.

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

4 files changed, 9 insertions, 226 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 0f997fddd212..201d829215fa 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.171 2015/08/02 09:26:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.172 2015/08/08 07:05:32 jer Exp $
+
+  08 Aug 2015; Jeroen Roovers <jer@gentoo.org> -chrony-1.31.1.ebuild,
+  -chrony-2.0.ebuild:
+  Old.
 
   02 Aug 2015; Pacho Ramos <pacho@gentoo.org> chrony-2.1.1.ebuild:
   sparc stable wrt bug #553616
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 090ad9013a15..82a5b8e58c0e 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,18 +5,14 @@ AUX chrony.logrotate 298 SHA256 d817c8efb0bcc26522a2e4e1308a8b449586ad750824720b
 AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 WHIRLPOOL 14e6e90959e434475f8d74a144fd342588e99a7102b15cedbf7a436ca32db3e09bbe4bd2630634fac9045db4b75a6c7afcd8f91c67bd8bb4f977d821d220ced9
 AUX chronyd.init 1739 SHA256 82a49a66f8d6db492ca14cc685535a395b8018230aedb09ee3ad3a476fe752d5 SHA512 7c56c55a741a9a7f4d4562418a143fd0f7108d4821641ccc536c20f9878d6c0e246ef7af33c4aa404d696dbb3d75dfcd3279def1e650c3e7f16ec0b7f69b71e4 WHIRLPOOL 761b3405a0308a61999a25c2a1a0d57bf718a5d23a1ca86e25ac3b663df79c27597a3969d7dbeeed3cba9f657c44fa42cedf59394b79a9a0f37e83308fe58089
 AUX chronyd.service-r2 261 SHA256 d5996c6b8596e137b36099d0ce7974bfd8e36411d999712d2f0393ac738f3754 SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe WHIRLPOOL f95d9472ad30fb06e3d0014ddc2be492dd1a6d2b5590bed27214ba1b0566d83e89e108a8df3de9dade939a9feff005bfff431d796f9e813388830e3f3dfc437b
-DIST chrony-1.31.1.tar.gz 395797 SHA256 0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348 SHA512 c64b0bfc52f091994774927900a12075afce876a1df66c0fc4ea8ad2b72cee189e044f886594e61b8aafb7d3ecf161a290aeff37bfd7da9d416f21b3213de2a4 WHIRLPOOL f933d10dd9a2b915d821718c3067e59c48f1beed0d8ddabba67f1b77dd19f64942ee2e7cab3d4b687ca76918b71723d44317aa91b6dcc394d776719b765831a9
-DIST chrony-2.0.tar.gz 396873 SHA256 f4da5f5071e77314b49281c48c35a03d07d76cbc7ec19e787b4414a86023b68b SHA512 ab44151cabfe6afe3b141d49476b6453517282a105e50549a50054bb8104251af1a484ebbf15558c44683bc90420ead354ddc8a64770f82bee53f30c4840a3d2 WHIRLPOOL 3bded68d2825ae92d7b840fc4521869d8f1ad59a4f1c7ee0441097e5173091dfe5f322efdb9223ed7d1f763008cd8ad7ec9264f5dc1b78c18c1c56e76dfb87cc
 DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e
-EBUILD chrony-1.31.1.ebuild 2577 SHA256 4a59c2ee84be4e70d2281b4a0cbef924e8a9bdfa4c3a60191144645f1e182110 SHA512 0ab3ee22989fd370052da03f5daf81e715e41fabda06a01b34f9065bdc17445773504467de9d3faba24ad4f9202311faeb99c1b53a4cb8c6475f7e87b946c8c6 WHIRLPOOL dd71f62d479027630d61d878af8d29782a31df9ab13ec08cba8ec4f66b205f470da32d550c3c6440a543a7cf2e94b69e52d6739aac739a19d0ee2bbee78c5e1f
-EBUILD chrony-2.0.ebuild 2897 SHA256 f64ab185812a8ac8f38fa027e552a79af7ce461af8680ca89f32222815966ce2 SHA512 51b71c58e6c719cdc44aca1a5ad957e9b66ff98cc826c5852b04144a0146e014f4b40fb9d8f8a5c3c556cd2231144a17e72c1e5fe1dfb681f99472085fd0e8ad WHIRLPOOL b70fa2191b405299ee81560b69d19ed5a59d20aba3a0daff34275390e6145c8f806279e676d2878527a232bb3770e37b41b018647b441553895255c1e62ffcd4
 EBUILD chrony-2.1.1.ebuild 2895 SHA256 8767e0475eae8b16fcc508033431b5fe72a77e4845a65eb2186d6e38290e3f28 SHA512 1bb92909081afb843efd7d9839953dcf276c03c29b41ff18a7d66d16c01f37f02fe6f30f3a40d35d70d284a6c05b9d1f9d6763e07db10a30659fb60091f3e1ce WHIRLPOOL 8fe3c69be03f5d7ac154fda999ed74191713744c0e3fe6956bf15850e2e33589cba15f8a2213e6f7ea5f2a3a9a5753a63129a77fec73c6e40b61f1df1d804648
-MISC ChangeLog 21221 SHA256 49b1f2668df8759e9ac5835f647c18a10a5ff9f85c02c5a55b9c90dca9153971 SHA512 c9b26785188dda14f9e70223531fac4d128f3b865dd928ddc29c6d9a97de8fd784a610edaaccc43f10b501f54495d7a386de463e743aa5122a8e654544441f95 WHIRLPOOL 8155dc0f905ced750efb070907d291b81cee734238dde5fbabde4da3e509600ad951baa95e301d5b0b0da2d276c56a16899be4185b531a43a59c5014bb7acf6b
+MISC ChangeLog 21319 SHA256 330649a8ee69bd8b1918b1cb1a71c3719ce076b4b6aebcde773d9c947f9364a2 SHA512 98f33ad29bda967580d13b93b4a1dec54516d661a6054d7cf4bdfd8175b4d3e76f4659016b60cee0aa8b2d995b766dbd0af44d08504a5c6f9277d5d294f6ca1d WHIRLPOOL 7d5307a81a1563e9261c5765947000a450fdf34e29509f8fdbffc2cd7f73c77e29c838d3857f82efe0bdf072fb26c00d0e4432176cdc27ef40798392f8fadd04
 MISC metadata.xml 1500 SHA256 e05e34bfb6a9e8963ed80678d62e94a2971a35a348ce6b36076887875bb3d8f5 SHA512 136adefcd4d937837f4ded7fc910920d192ebdab0b91bf2c0124fed08e8d70cba56a6809f600232820d1c02aceaa224819c60b09dd4756820418a01a9bea221e WHIRLPOOL 2fc073ac20e75a94caca378134d0846f659d64f3d84cfd3902adcd954d2d6f157289823f5050b6e3954181c942fa6da30795d31692139db079e613af4059c1fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlW94l4ACgkQCaWpQKGI+9R53wCfbhfl2UhBpFk5M327RD4aRlMt
-AUMAn1ay2lYBHZUh35X8krEFa3X/HbZx
-=6wKw
+iEYEAREIAAYFAlXFqj0ACgkQVWmRsqeSphPCPwCfeBnwR/ZpUMOn2KLNAT5TCW3i
+c5cAn0mrB0XNJAzA4bMA+VCyXNpPaBTE
+=jEvX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.31.1.ebuild b/net-misc/chrony/chrony-1.31.1.ebuild
deleted file mode 100644
index d5bd44342661..000000000000
--- a/net-misc/chrony/chrony-1.31.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.31.1.ebuild,v 1.7 2015/04/29 09:18:51 ago 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 ppc64 sparc x86"
-IUSE="caps ipv6 libedit readline +rtc selinux"
-REQUIRED_USE="?? ( libedit readline )"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	readline? ( >=sys-libs/readline-4.1-r4 )
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/texinfo
-"
-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 chrony.texi.in chrony.txt examples/* FAQ || die
-}
-
-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 \
-		$(usex caps '' --disable-linuxcaps) \
-		$(usex ipv6 '' --disable-ipv6) \
-		$(usex rtc '' --disable-rtc) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--without-nss \
-		--without-tomcrypt
-	"
-
-	# print the ./configure call to aid in future debugging
-	einfo ${CHRONY_CONFIGURE}
-	sh ${CHRONY_CONFIGURE} || 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
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example chrony.conf
-	newins examples/chrony.keys.example chrony.keys
-
-	keepdir /var/{lib,log}/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony.logrotate chrony
-
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
diff --git a/net-misc/chrony/chrony-2.0.ebuild b/net-misc/chrony/chrony-2.0.ebuild
deleted file mode 100644
index a75f487eae51..000000000000
--- a/net-misc/chrony/chrony-2.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-2.0.ebuild,v 1.2 2015/05/11 04:36:03 jer 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 ~ppc64 ~sparc ~x86"
-IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
-REQUIRED_USE="
-	?? ( libedit readline )
-"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/texinfo
-"
-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 chrony.texi.in chrony.txt examples/* FAQ || die
-}
-
-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 \
-		$(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 rtc '' --disable-rtc) \
-		$(usex refclock '' --disable-refclock) \
-		$(usex adns '' --disable-asyncdns) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
-		--infodir=/usr/share/info \
-		--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
-}
-
-src_install() {
-	default
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-	doinfo chrony.info*
-
-	newinitd "${FILESDIR}"/chronyd.init chronyd
-	newconfd "${FILESDIR}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example3 chrony.conf
-	newins examples/chrony.keys.example chrony.keys
-
-	dodoc examples/*.example*
-
-	keepdir /var/{lib,log}/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony.logrotate chrony
-
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}