marking 1.20 stable and removing 1.19.99.2

7 files changed, 13 insertions, 116 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index a8964c8383bb..73cd93a8c91b 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-misc/chrony
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.14 2004/06/02 20:59:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.15 2004/06/07 08:38:49 wmertens Exp $
 
+  07 Jun 2004; Wout Mertens <wmertens@gentoo.org> chrony-1.20.ebuild,
+  chrony-1.19.99.2.ebuild:
+  1.20 marked stable for x86, 1.19.99.2 removed.
+  
   02 Jun 2004; David Holm <dholm@gentoo.org> chrony-1.20.ebuild:
   Added to ~ppc.
 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6c0d4ff15149..59d1892d46ce 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,15 +1,11 @@
-MD5 3b2bb1c86245e8f5d40003b3bed41ce3 ChangeLog 1840
-MD5 040423d12436666adf5f5e9ac83f5006 chrony-1.19.99.2.ebuild 1201
+MD5 b1feb21ddca7fd0ed441dc93b7a1269c ChangeLog 1989
+MD5 f8283b04943b6704e7bcfa527d5b051c chrony-1.20.ebuild 1202
 MD5 2b8be2ae405396835bd38092461ec669 chrony-1.19.ebuild 1196
-MD5 49f3ff9ed4c14d8bc8b3fc4c706dff22 chrony-1.20.ebuild 1203
+MD5 d06dfee7fc077a1c209193d1627efd96 files/chronyd.conf 795
+MD5 a9b084f00b5e3860eeee3de4c0a8d14d files/chronyd.rc 1618
+MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20 63
+MD5 c0e426c615798b7c75afc3b1aadcd727 files/digest-chrony-1.19 63
 MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19-chrony.conf.example-gentoo.diff 1592
 MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
-MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19.99.2-chrony.conf.example-gentoo.diff 1592
-MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19.99.2-conf.c-gentoo.diff 342
 MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.20-chrony.conf.example-gentoo.diff 1592
 MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.20-conf.c-gentoo.diff 342
-MD5 d06dfee7fc077a1c209193d1627efd96 files/chronyd.conf 795
-MD5 a9b084f00b5e3860eeee3de4c0a8d14d files/chronyd.rc 1618
-MD5 c0e426c615798b7c75afc3b1aadcd727 files/digest-chrony-1.19 63
-MD5 3c6f0383871cdd1f005b04a37ccf1cfc files/digest-chrony-1.19.99.2 68
-MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20 63
diff --git a/net-misc/chrony/chrony-1.19.99.2.ebuild b/net-misc/chrony/chrony-1.19.99.2.ebuild
deleted file mode 100644
index 2aa99e3f863d..000000000000
--- a/net-misc/chrony/chrony-1.19.99.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.19.99.2.ebuild,v 1.4 2004/03/19 10:07:12 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.sunsite.dk/"
-SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 sparc"
-IUSE="readline"
-
-DEPEND="virtual/glibc
-	readline? ( >=sys-libs/readline-4.1-r4 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
-	epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
-}
-
-src_compile() {
-	econf `use_enable readline` || die
-	emake all docs || die
-}
-
-src_install() {
-	# the chrony install is brain-dead so we'll just do it ourselves
-	dobin chronyc
-	dosbin chronyd
-
-	dodoc chrony.txt README examples/chrony.{conf,keys}.example
-	dohtml chrony.html
-	doman *.{1,5,8}
-	doinfo chrony.info*
-
-	dodir /etc/chrony
-	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
-	insinto /etc/conf.d ; newins ${FILESDIR}/chronyd.conf chronyd
-	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
-}
diff --git a/net-misc/chrony/chrony-1.20.ebuild b/net-misc/chrony/chrony-1.20.ebuild
index 6ad4edb5ad4e..976abb5e2e4b 100644
--- a/net-misc/chrony/chrony-1.20.ebuild
+++ b/net-misc/chrony/chrony-1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20.ebuild,v 1.4 2004/06/02 20:59:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20.ebuild,v 1.5 2004/06/07 08:38:50 wmertens Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~mips sparc ~ppc"
+KEYWORDS="x86 ~mips sparc ~ppc"
 IUSE="readline"
 
 DEPEND="virtual/glibc
diff --git a/net-misc/chrony/files/chrony-1.19.99.2-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.19.99.2-chrony.conf.example-gentoo.diff
deleted file mode 100644
index 7f1f2c9cccfc..000000000000
--- a/net-misc/chrony/files/chrony-1.19.99.2-chrony.conf.example-gentoo.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- examples/chrony.conf.example.orig	2003-06-16 11:59:01.000000000 -0400
-+++ examples/chrony.conf.example	2003-06-16 12:00:13.000000000 -0400
-@@ -3,5 +3,5 @@
- #
- # This is an example chrony configuration file.  You should copy it to
--# /etc/chrony.conf after uncommenting and editing the options that you
-+# /etc/chrony/chrony.conf after uncommenting and editing the options that you
- # want to enable.  I have not included the more obscure options.  Refer
- # to the documentation for these.
-@@ -91,5 +91,5 @@
- # generally want this, so it is uncommented.
- 
--driftfile /etc/chrony.drift
-+driftfile /etc/chrony/chrony.drift
- 
- # If you want to use the program called chronyc to configure aspects of
-@@ -100,5 +100,5 @@
- # assumed by default.
- 
--keyfile /etc/chrony.keys
-+keyfile /etc/chrony/chrony.keys
- 
- # Tell chronyd which numbered key in the file is used as the password
-@@ -158,6 +158,6 @@
- ! log measurements statistics tracking
- 
--If you have real time clock support enabled (see below), you might want
--this line instead:
-+# If you have real time clock support enabled (see below), you might want
-+# this line instead:
- 
- ! log measurements statistics tracking rtc
-@@ -269,5 +269,5 @@
- # kernel.  (Note, these options apply only to Linux.)
- 
--! rtcfile /etc/chrony.rtc
-+! rtcfile /etc/chrony/chrony.rtc
- 
- # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
-@@ -285,5 +285,5 @@
- # using devfs), uncomment and edit the following line.
- 
--! rtcdevice /dev/misc/rtc
-+rtcdevice /dev/misc/rtc
- 
- #######################################################################
diff --git a/net-misc/chrony/files/chrony-1.19.99.2-conf.c-gentoo.diff b/net-misc/chrony/files/chrony-1.19.99.2-conf.c-gentoo.diff
deleted file mode 100644
index fabc47097ff9..000000000000
--- a/net-misc/chrony/files/chrony-1.19.99.2-conf.c-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf.c.orig	Sun May 12 14:07:31 2002
-+++ conf.c	Sun May 12 14:07:52 2002
-@@ -45,7 +45,7 @@
- 
- /* ================================================== */
- 
--#define DEFAULT_CONF_FILE "/etc/chrony.conf"
-+#define DEFAULT_CONF_FILE "/etc/chrony/chrony.conf"
- 
- /* ================================================== */
- /* Forward prototypes */
diff --git a/net-misc/chrony/files/digest-chrony-1.19.99.2 b/net-misc/chrony/files/digest-chrony-1.19.99.2
deleted file mode 100644
index 952973fcb9ce..000000000000
--- a/net-misc/chrony/files/digest-chrony-1.19.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a126c617beb2a6b99861cadd095da0f5 chrony-1.19.99.2.tar.gz 307479