5 files changed, 10 insertions, 123 deletions
diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index b568899cfc6a..32ce74c2813d 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.147 2014/11/02 09:06:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.148 2014/11/05 11:24:29 jer Exp $
+
+  05 Nov 2014; Jeroen Roovers <jer@gentoo.org> -chrony-1.30-r1.ebuild,
+  -files/chronyd.service, -files/chronyd.service-r1:
+  Old.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> chrony-1.31.ebuild:
   Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3e4039771359..f704036ff3f5 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -4,29 +4,15 @@ Hash: SHA256
 AUX chrony.logrotate 298 SHA256 d817c8efb0bcc26522a2e4e1308a8b449586ad750824720b38142712e518a8f6 SHA512 fb49c79945e3e0f9138377595a7d25530c86da323829f512a29e43fa01196ee38d7de9b1797adc53e2cbd02f1f8cd0dab4a1531e3c7e8b8c53cc7dd96ebec93f WHIRLPOOL ce4df932e8b6b35123c89372bf52dd927954f98454616452e88c27a33acfce65d8b341b7c9615067252b39ea27a82fb6bb110237b91225ecad01caf7b735e685
 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
 AUX chronyd.service-r2 261 SHA256 d5996c6b8596e137b36099d0ce7974bfd8e36411d999712d2f0393ac738f3754 SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe WHIRLPOOL f95d9472ad30fb06e3d0014ddc2be492dd1a6d2b5590bed27214ba1b0566d83e89e108a8df3de9dade939a9feff005bfff431d796f9e813388830e3f3dfc437b
-DIST chrony-1.30.tar.gz 389130 SHA256 43aca956a0beb2c4847feffc847fec2c429ee9afb6252c7a499bbd68933046dd SHA512 fdc197d47a476da6b04f691804eff9b356cdca3a1dd5fd8827ad8983259cc17f52a221d86441f73d35a2953b71339c02e4e4fa2d7eb4a17e4a976e0ca75908e3 WHIRLPOOL 7ef4807b0201c47e72454613ea38ca6a04346e7c7aa16c3b679a9146a7273dfc16d212c635e2d8cba3727849c7144f8f976a7fd2c6b785f18086de83a0865ae5
 DIST chrony-1.31.tar.gz 395742 SHA256 a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d SHA512 fcac8f61525b0c9aee83ec6c5fc4a948f6ee838ffa302661922d273ce0a9f03735fcbcd798bb1f1221d581da7601663bc4f16996dc948bd0ba10ac90caaa09a4 WHIRLPOOL 6bc01cf1ad7f2c4bf26f4ebcd4244e2e0f8aec3257f09e57ab6d419ecf52de4a78ecb41394c3f492ec0982d20156e191923cc1a8789e33d7a87dc1c9a72ef5c6
-EBUILD chrony-1.30-r1.ebuild 1897 SHA256 867635a5a8d5799c5d701f1bb2a0a124023bcdf9dfd516f7f592b252de10b78c SHA512 0a3858e4d090a5564fceabdb95da832032b07ab97e59e3416ece573715816285982bb63ff7ff69be96afb9de69d4e9154a6fe059b7b803257e5fac44df15df9e WHIRLPOOL cb93dfae3b04c7c0f7a0f779e9affb0e448502f863759b81e952e74e2f6c97ef5c42db7a5fa2db4a821870dc332f0a608afb7de2d764a5ef677ae77a971865bf
 EBUILD chrony-1.31.ebuild 1920 SHA256 0e7370fdb6e5f63e1639ef69d85e9f9e3a3bc697320aef80f4832aba0ac9c996 SHA512 0c5c58ddb71acc360f8fa47ee547ea49f97297c1bf0124acc522c2a0a8cae38741133fb6d21ceb448eb69356394d167dfe47bdf396cae3392c8ddf49123892c2 WHIRLPOOL 7db8a60a44131a85d578e3fb324e7cd2ab54ae76bbc9ee0a843a34bd1a6200e4ac032b9301f491b2de8d7a01e4e87d2f245d6a8890ee34df79f96861c679ab08
-MISC ChangeLog 18377 SHA256 e8d8511d510b8499f26b2aa77a5f1abb50856c631842ea72504ec5df156671e5 SHA512 4a4a4c02163ab52153f803313d35c595ff1b3648d72b40fe1fe492c430b7ff1a4f50593ee13139a9c826bab76db894334d8c3043f5c8ff8222a8527fbd0821e0 WHIRLPOOL 099affbcb92213fc540ed0a77beebb51e6f68dd6b17b100b7e7d7751708b47109180081f5f5aa694e5ac428815cf032a4c613bdf6e9e6c8e314c7c8928111133
+MISC ChangeLog 18507 SHA256 ea3b036763fbfef553586a2ce7b74098b31eec20becd384afb10f96960bb372e SHA512 63efa701a29a78c11614a876f1eaae75cbe61044b7e82f2187d0d046efd6daba231bdb815dba7b038e9f0e8572bc5610b4dcffa92c8e29de87d412cfc3960514 WHIRLPOOL 229eafad93fcd1114b4a11caf04b86c16ffd24230f6f8b4f9bad2404e5bd4b5302db9009e23a02a1147ba80934de2287a334fbeca8c10ba94be9b39b6ead62f3
 MISC metadata.xml 1086 SHA256 18d59935890367a9bbe405207a32ba70aa57304075efc6814bda5128ec226d8d SHA512 2674fcc6a9d454544dcfea5002a93ec6ad9b107651d11f2d75d6d187fffa4502cb9ea1bcd3fc2a6e7dbf07b9b18e928534c0c442fbb01abff1660d726f3cd0c2 WHIRLPOOL e21367e6d4fd6a02a8bc56546c90b80fee2d5c5c9160a0f9ff6b6896babc3e7e956a0ad525adaf6fc22b16e12f1570f0f5528bdc47ee8913031b70e2757b3797
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVfP7AAoJEC7dUkA7aK9HAT4P/1/xqW0YGGPSCeH65A7vKoRT
-DU0kJzmiG6xTwpLaCd3TjkoMz1SjQ3eOMFxxCWV4OOc7VPlZhc6JR0ozXCSFmBfA
-5Ch9Hu/m4alb1T4n3Hdet4kioikj2hhEe8MYo6gDiaHnWxSgmFURgYvUN90hmoZg
-2B4c3vknvBzzaDcULDzmq+IiiI/jfbD8AcMVVMr/8TCouoSJXnWOYuGwypAwvk3o
-UB7Yl755sXhkiT6EIH84kU9oFvI7ZbFI50uUGIRdxPOMN+Jsd57f5HY/1r5JnypU
-wBsZlImdj95EKvERsuyqcnwt37ETe85foIufESA1hedO9JtQ3AuqTnSll0Zkwwjg
-6ljWB1KvU0zt5LjlCf3n+UgWSA+u+tRNrcmk4eVxcYhWjumcFTwx5sbQVdoM1Ubt
-00P5WOPqtJFPcOgZbUCfAXISk4hIYWoeQRsynlPwLhsuqfoo9rdUlzeGF287klmH
-bjX+xkOpms5BvvQpcFsx2v96I1Nj5CRmxupfz9w4B7rern1pUlKQ1PSttHLMGj4A
-P8kVKr2MInSgBXziWjZTKtaeuNN8zAqQsICfvbZuMX3gBJDy9ZoxdiKvAbf1mRqz
-mJ+LPHWyzPu61okc68BQKJ3n3pPe27XuiwbyVqnpqrl0hXXbZ1hN6czPfVB/SCUr
-jOpmIrR0YCO544mpGgir
-=mfoi
+iEYEAREIAAYFAlRaCO4ACgkQVWmRsqeSphNTVwCfUT+RPSd3FWLk5+kkgALo416p
+Al8An2Llwwf561XJYtDprh0p/Ekgn8Sw
+=j3RY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.30-r1.ebuild b/net-misc/chrony/chrony-1.30-r1.ebuild
deleted file mode 100644
index 4b0e57b32baf..000000000000
--- a/net-misc/chrony/chrony-1.30-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.30-r1.ebuild,v 1.1 2014/08/06 09:44:31 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 sparc x86"
-IUSE="caps ipv6 +readline +rtc selinux"
-
-RDEPEND="
-	caps? ( sys-libs/libcap )
-	readline? ( >=sys-libs/readline-4.1-r4 )
-	selinux? ( sec-policy/selinux-chronyd )
-"
-DEPEND="
-	${RDEPEND}
-	sys-apps/texinfo
-"
-
-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
-
-	# 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
-
-	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-r1 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
diff --git a/net-misc/chrony/files/chronyd.service b/net-misc/chrony/files/chronyd.service
deleted file mode 100644
index 03592f9ced5b..000000000000
--- a/net-misc/chrony/files/chronyd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Chrony Network Time Service
-After=syslog.target ntpdate.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/chronyd -r -s
-ControlGroup=cpu:/
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/chrony/files/chronyd.service-r1 b/net-misc/chrony/files/chronyd.service-r1
deleted file mode 100644
index 49e40882c3fc..000000000000
--- a/net-misc/chrony/files/chronyd.service-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-[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