Cleaning

(Portage version: 2.1.2.2)

10 files changed, 8 insertions, 314 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 3dad0c9d7d8a..17bfbcfee26c 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/chrony
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.34 2006/11/03 20:58:05 iluxa Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.35 2007/03/12 10:39:01 tove Exp $
+
+  12 Mar 2007; Torsten Veller <tove@gentoo.org>
+  -files/chrony-1.20-sys_linux.c-gentoo.diff,
+  -files/chrony-1.21-addrfilt.c.diff, -files/chrony-1.21-io_linux.h.diff,
+  -chrony-1.20.ebuild, -chrony-1.20-r1.ebuild, -chrony-1.21.ebuild:
+  Cleaning
 
   03 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   chrony-1.21-r1.ebuild:
diff --git a/net-misc/chrony/chrony-1.20-r1.ebuild b/net-misc/chrony/chrony-1.20-r1.ebuild
deleted file mode 100644
index ea6b34540a68..000000000000
--- a/net-misc/chrony/chrony-1.20-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20-r1.ebuild,v 1.4 2005/07/15 18:56:25 killerfox 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="hppa ~mips ~ppc ~sparc ~x86"
-IUSE="readline"
-
-DEPEND="virtual/libc
-	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
-	# Allow Hz=200 detection (#21058, Alexander Papaspyrou)
-	epatch ${FILESDIR}/${P}-sys_linux.c-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
deleted file mode 100644
index 47059f415b66..000000000000
--- a/net-misc/chrony/chrony-1.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.8 2005/05/01 17:05:34 hansmi 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 ~mips sparc ppc"
-IUSE="readline"
-
-DEPEND="virtual/libc
-	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.21.ebuild b/net-misc/chrony/chrony-1.21.ebuild
deleted file mode 100644
index 4f20dea8783b..000000000000
--- a/net-misc/chrony/chrony-1.21.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21.ebuild,v 1.3 2006/04/26 18:30:53 squinky86 Exp $
-
-inherit eutils toolchain-funcs
-
-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="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )"
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.20-conf.c-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-1.20-chrony.conf.example-gentoo.diff
-	epatch "${FILESDIR}"/${P}-addrfilt.c.diff
-	epatch "${FILESDIR}"/${P}-io_linux.h.diff
-
-	# Allow Hz=200 detection (#21058, Alexander Papaspyrou)
-#	epatch "${FILESDIR}"/${PN}-1.20-sys_linux.c-gentoo.diff
-
-	sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
-		chrony.conf.5 faq.txt chrony.texi || die "sed failed"
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf $(use_enable readline) || die "configure failed"
-	emake all || die "make failed"
-	emake docs || die "make docs failed"
-}
-
-src_install() {
-	dobin chronyc || die "dobin failed"
-	dosbin chronyd || die "dosbin failed"
-
-	dodoc chrony.txt README examples/chrony.{conf,keys}.example || die "dodoc failed"
-	dohtml chrony.html || die "dohtml failed"
-	doman *.{1,5,8}
-	doinfo chrony.info*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}"/chronyd.rc chronyd || die "newexe failed"
-	insinto /etc/conf.d
-	newins "${FILESDIR}"/chronyd.conf chronyd || die "newins failed"
-	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
-
-	keepdir /var/{lib,log}/chrony /etc/chrony
-}
diff --git a/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff b/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff
deleted file mode 100644
index 063be7aba9a6..000000000000
--- a/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- sys_linux.c.orig	2003-10-04 15:56:40.000000000 -0400
-+++ sys_linux.c	2003-10-09 21:06:06.000000000 -0400
-@@ -448,6 +448,7 @@
- 
-   if (TMX_SetFrequency(scaled_freq, required_tick) < 0) {
-     char buffer[1024];
-+      perror("failed");
-     sprintf(buffer, "adjtimex failed for set_frequency, freq_ppm=%10.4e scaled_freq=%10.4e required_tick=%ld",
-             freq_ppm, scaled_freq, required_tick);
-     CROAK(buffer);
-@@ -600,6 +601,16 @@
-     *shift_hz = 7;
-     return;
-   }
-+  /* GENTOO: Gentoo Linux has hz=200
-+   * tick_nominal: 5000
-+   * tick_lo: 3333
-+   * tick_hi: 6667 */
-+  if (tick >= 3333 && tick <= 6667) {
-+    *hz = 200;
-+    *shift_hz = 8;
-+    return;
-+  }
-+  /* END GENTOO */
- 
-   for (i=4; i<16; i++) { /* surely 16 .. 32768 is a wide enough range? */
-     ihz = 1 << i;
diff --git a/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff b/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff
deleted file mode 100644
index 07f7cb36b511..000000000000
--- a/net-misc/chrony/files/chrony-1.21-addrfilt.c.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-Patched addrfilt.c to fix gcc 4.0 build problem.
-"array type has incomplete element type"
-Taken from Debian: <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298709>
-diff -ur chrony-1.21/addrfilt.c chrony-1.21/addrfilt.c
---- chrony-1.21/addrfilt.c	2005-08-11 22:32:54.000000000 +0200
-+++ chrony-1.21/addrfilt.c	2005-11-15 04:05:06.000000000 +0100
-@@ -43,17 +43,15 @@
- /* Define the table size */
- #define TABLE_SIZE (1UL<<NBITS)
- 
--struct _TableNode;
--
--typedef struct _TableNode ExtendedTable[TABLE_SIZE];
--
- typedef enum {DENY, ALLOW, AS_PARENT} State;
- 
- typedef struct _TableNode {
-   State state;
--  ExtendedTable *extended;
-+  struct _TableNode *extended;
- } TableNode;
- 
-+typedef struct _TableNode ExtendedTable[TABLE_SIZE];
-+
- struct ADF_AuthTableInst {
-   TableNode base;
- };
-@@ -101,7 +99,7 @@
- 
-   if (node->extended != NULL) {
-     for (i=0; i<TABLE_SIZE; i++) {
--      child_node = &((*(node->extended))[i]);
-+      child_node = node->extended + i;
-       close_node(child_node);
-     }
-     Free(node->extended);
-@@ -124,10 +122,11 @@
- 
-   if (node->extended == NULL) {
- 
--    node->extended = MallocNew(ExtendedTable);
-+
-+    node->extended = (TableNode *) MallocArray(ExtendedTable, TABLE_SIZE);
- 
-     for (i=0; i<TABLE_SIZE; i++) {
--      child_node = &((*(node->extended))[i]);
-+      child_node = node->extended + i;
-       child_node->state = AS_PARENT;
-       child_node->extended = NULL;
-     }
-@@ -168,7 +167,7 @@
-         if (!(node->extended)) {
-           open_node(node);
-         }
--        node = &((*(node->extended))[subnet]);
-+        node = node->extended + subnet;
-         bits_to_go -= NBITS;
-       }
- 
-@@ -187,7 +186,7 @@
-         if (!(node->extended)) {
-           open_node(node);
-         }
--        node = &((*(node->extended))[subnet]);
-+        node = node->extended + subnet;
-         bits_to_go -= NBITS;
-       }
- 
-@@ -199,7 +198,7 @@
-       }
-       
-       for (i=subnet, j=0; j<N; i++, j++) {
--        this_node = &((*(node->extended))[i]);
-+        this_node = node->extended + i;
-         if (delete_children) {
-           close_node(this_node);
-         }
-@@ -283,7 +282,7 @@
-     if (node->extended) {
-       subnet = get_subnet(residual);
-       residual = get_residual(residual);
--      node = &((*(node->extended))[subnet]);
-+      node = node->extended + subnet;
-     } else {
-       /* Make decision on this node */
-       finished = 1;
diff --git a/net-misc/chrony/files/chrony-1.21-io_linux.h.diff b/net-misc/chrony/files/chrony-1.21-io_linux.h.diff
deleted file mode 100644
index 3a9085c0f638..000000000000
--- a/net-misc/chrony/files/chrony-1.21-io_linux.h.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Patched io_linux.h to add missing architectures.
-#error "I don't know the values of the _IOC_* constants for your architecture"
-Taken from Debian's chrony_1.21-2.diff.gz.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=339764
---- chrony-1.21/io_linux.h
-+++ chrony-1.21/io_linux.h
-@@ -6,26 +6,24 @@
- 
- /* Hmm.  These constants vary a bit between systems. */
- /* (__sh__ includes both sh and sh64) */
--#if defined(__i386__) || defined(__sh__)
-+#if defined(__alpha__) || defined(__sparc__) || defined(__mips__) || defined(__ppc__) || defined(__ppc64__) || defined(__sparc64__)
- #define CHRONY_IOC_NRBITS	8
- #define CHRONY_IOC_TYPEBITS	8
--#define CHRONY_IOC_SIZEBITS	14
-+#define CHRONY_IOC_SIZEBITS	13
- #define CHRONY_IOC_DIRBITS	2
- 
--#define CHRONY_IOC_NONE	0U
--#define CHRONY_IOC_WRITE	1U
--#define CHRONY_IOC_READ	2U
--#elif defined(__alpha__) || defined(__sparc__)
-+#define CHRONY_IOC_NONE         1U
-+#define CHRONY_IOC_READ         2U
-+#define CHRONY_IOC_WRITE        4U
-+#else
- #define CHRONY_IOC_NRBITS	8
- #define CHRONY_IOC_TYPEBITS	8
--#define CHRONY_IOC_SIZEBITS	13
-+#define CHRONY_IOC_SIZEBITS	14
- #define CHRONY_IOC_DIRBITS	2
- 
--#define CHRONY_IOC_NONE        1U
--#define CHRONY_IOC_READ        2U
--#define CHRONY_IOC_WRITE       4U
--#else
--#error "I don't know the values of the _IOC_* constants for your architecture"
-+#define CHRONY_IOC_NONE	        0U
-+#define CHRONY_IOC_WRITE	1U
-+#define CHRONY_IOC_READ	        2U
- #endif
- 
- #define CHRONY_IOC_NRMASK	((1 << CHRONY_IOC_NRBITS)-1)
diff --git a/net-misc/chrony/files/digest-chrony-1.20 b/net-misc/chrony/files/digest-chrony-1.20
deleted file mode 100644
index 6b73fa502e2f..000000000000
--- a/net-misc/chrony/files/digest-chrony-1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0f89e9e13fa47d04fd9f99e56c615c2 chrony-1.20.tar.gz 308253
-RMD160 ec6f570c29b68983752ff8b025d908372bdf2fb1 chrony-1.20.tar.gz 308253
-SHA256 216b7d5d138d7300b4f73e66d04a075a9ac0647ddfd72e533c39ba4c4c89ec65 chrony-1.20.tar.gz 308253
diff --git a/net-misc/chrony/files/digest-chrony-1.20-r1 b/net-misc/chrony/files/digest-chrony-1.20-r1
deleted file mode 100644
index 6b73fa502e2f..000000000000
--- a/net-misc/chrony/files/digest-chrony-1.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0f89e9e13fa47d04fd9f99e56c615c2 chrony-1.20.tar.gz 308253
-RMD160 ec6f570c29b68983752ff8b025d908372bdf2fb1 chrony-1.20.tar.gz 308253
-SHA256 216b7d5d138d7300b4f73e66d04a075a9ac0647ddfd72e533c39ba4c4c89ec65 chrony-1.20.tar.gz 308253
diff --git a/net-misc/chrony/files/digest-chrony-1.21 b/net-misc/chrony/files/digest-chrony-1.21
deleted file mode 100644
index 01a8f27f64db..000000000000
--- a/net-misc/chrony/files/digest-chrony-1.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84f76a73dff5a3c9e9f11f3c29a4e93b chrony-1.21.tar.gz 310709
-RMD160 5a758608b0ff0d578b3d4597f4ee6ef740492b9b chrony-1.21.tar.gz 310709
-SHA256 baca3d36e6f458bed31c82f08f3c5f9d61b43baafc4d17f3e0a74dec7ff737d3 chrony-1.21.tar.gz 310709