Old.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 5 insertions, 82 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 2ea279049123..94d44323658e 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.86 2012/02/14 23:10:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.87 2012/02/15 13:21:06 jer Exp $
+
+  15 Feb 2012; Jeroen Roovers <jer@gentoo.org> -chrony-1.25.ebuild,
+  -files/chrony-1.25-linux3.patch:
+  Old.
 
   14 Feb 2012; Brent Baude <ranger@gentoo.org> chrony-1.26.ebuild:
   Marking chrony-1.26 ppc for bug 383687
diff --git a/net-misc/chrony/chrony-1.25.ebuild b/net-misc/chrony/chrony-1.25.ebuild
deleted file mode 100644
index c49ebe5643ce..000000000000
--- a/net-misc/chrony/chrony-1.25.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.25.ebuild,v 1.8 2011/12/29 17:49:27 jer Exp $
-
-EAPI=2
-
-inherit eutils 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="ppc"
-IUSE="caps readline"
-
-RDEPEND="
-	readline? ( >=sys-libs/readline-4.1-r4 )
-	caps? ( sys-libs/libcap )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i "s:/etc/chrony\.:/etc/chrony/chrony.:g" \
-		examples/* chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	local myconf
-	use readline || myconf+=" --disable-readline"
-	#use ipv6     || myconf+=" --disable-ipv6"
-	use caps     || myconf+=" --disable-linuxcaps"
-	# selfwritten configure
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		${myconf} ${EXTRA_ECONF} || die "configure failed"
-}
-
-src_compile() {
-	emake all || die "make failed"
-	emake docs || die "make docs failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-	dodoc examples/chrony.{conf,keys}.example || die
-	doinfo chrony.info* || die
-
-	newinitd "${FILESDIR}"/chronyd.rc chronyd || die
-	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" \
-		/etc/init.d/chronyd || die "doc sed failed"
-	newconfd "${FILESDIR}"/chronyd.conf chronyd || die
-
-	keepdir /var/{lib,log}/chrony /etc/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony.logrotate chrony
-}
diff --git a/net-misc/chrony/files/chrony-1.25-linux3.patch b/net-misc/chrony/files/chrony-1.25-linux3.patch
deleted file mode 100644
index 473759f24da8..000000000000
--- a/net-misc/chrony/files/chrony-1.25-linux3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur chrony-1.25.orig//sys_linux.c chrony-1.25//sys_linux.c
---- chrony-1.25.orig//sys_linux.c	2011-05-04 06:29:40.000000000 -0400
-+++ chrony-1.25//sys_linux.c	2011-06-07 01:29:18.254878791 -0400
-@@ -1050,6 +1050,12 @@
-           LOG_FATAL(LOGF_SysLinux, "Kernel version not supported yet, sorry.");
-       }
-       break;
-+    case 3:
-+      /* Linux 3.0 (formerly 2.6.40) */
-+      /* These don't need scaling. (similar to 2.6.28 and later) */
-+      freq_scale = 1.0;
-+      have_readonly_adjtime = 2;
-+      break;
-     default:
-       LOG_FATAL(LOGF_SysLinux, "Kernel's major version not supported yet, sorry");
-       break;