fix ntpclockset - RESTRICT=test - add metadata.xml - fix file collision (bug #131182 #150236)

(Portage version: 2.1.1)

5 files changed, 31 insertions, 8 deletions

diff --git a/net-misc/clockspeed/ChangeLog b/net-misc/clockspeed/ChangeLog
index f4653f9cc401..0694152c2110 100644
--- a/net-misc/clockspeed/ChangeLog
+++ b/net-misc/clockspeed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/clockspeed
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.18 2006/05/25 21:50:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.19 2006/10/19 10:04:22 bangert Exp $
+
+  19 Oct 2006; Thilo Bangert <bangert@gentoo.org> files/ntpclockset,
+  +metadata.xml, clockspeed-0.62-r3.ebuild, clockspeed-0.62-r4.ebuild:
+  - fix ntpclockset to resolve pool.ntp.org (bug #131182)
+  - RESTRICT=test (bug #150236)
+  - add metadata.xml and me as maintainer
+  - fix file collision with libowfat in -r4
 
 *clockspeed-0.62-r4 (25 May 2006)
 
diff --git a/net-misc/clockspeed/clockspeed-0.62-r3.ebuild b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
index 0a74bfe28759..48125bf6d66d 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r3.ebuild,v 1.10 2005/05/14 18:24:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r3.ebuild,v 1.11 2006/10/19 10:04:22 bangert Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,6 +12,7 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~mips x86"
 IUSE="static selinux"
+RESTRICT="test"
 
 DEPEND="sys-apps/groff"
 RDEPEND=" selinux? ( sec-policy/selinux-clockspeed )"
diff --git a/net-misc/clockspeed/clockspeed-0.62-r4.ebuild b/net-misc/clockspeed/clockspeed-0.62-r4.ebuild
index 9fb40c50b4ba..6c107ee473da 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r4.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r4.ebuild,v 1.1 2006/05/25 21:50:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r4.ebuild,v 1.2 2006/10/19 10:04:22 bangert Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,9 +12,10 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
 IUSE="static selinux"
+RESTRICT="test"
 
 DEPEND="sys-apps/groff"
-RDEPEND=" selinux? ( sec-policy/selinux-clockspeed )"
+RDEPEND="selinux? ( sec-policy/selinux-clockspeed )"
 
 # this is the trailing part of the name for the latest leapseconds file.
 LEAPSECONDS_DATE="20060525"
@@ -32,7 +33,7 @@ src_install() {
 	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd || die "dobin"
 	dosbin "${FILESDIR}"/ntpclockset || die "dosbin"
 
-	doman *.[13]
+	doman *.1
 	dodoc BLURB CHANGES INSTALL README THANKS TODO
 
 	insinto /var/lib/clockspeed
diff --git a/net-misc/clockspeed/files/ntpclockset b/net-misc/clockspeed/files/ntpclockset
index 7240d793756b..5ff0751a3ad5 100644
--- a/net-misc/clockspeed/files/ntpclockset
+++ b/net-misc/clockspeed/files/ntpclockset
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/files/ntpclockset,v 1.3 2004/08/31 02:00:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/files/ntpclockset,v 1.4 2006/10/19 10:04:22 bangert Exp $
 
 # Updates by Sascha Silbe
 
@@ -16,7 +16,6 @@ EOF
 }
 
 quiet=0
-NTPSERVER="pool.ntp.org"
 
 for curArg in "$@" ; do
 	case "${curArg}" in
@@ -28,6 +27,8 @@ for curArg in "$@" ; do
 	esac
 done
 
+[ -z $NTPSERVER ] && NTPSERVER=`dnsip pool.ntp.org | awk '{print $1}'`
+
 tmpfile="`mktemp`"
 # display how much your clock is off by
 if ! sntpclock $NTPSERVER > ${tmpfile} ; then
diff --git a/net-misc/clockspeed/metadata.xml b/net-misc/clockspeed/metadata.xml
new file mode 100644
index 000000000000..1c3fcf351c98
--- /dev/null
+++ b/net-misc/clockspeed/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>bangert@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+clockspeed uses a hardware tick counter to compensate for a persistently fast or
+slow system clock. Given a few time measurements from a reliable source, it
+computes and then eliminates the clock skew. 
+</longdescription>
+</pkgmetadata>