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

Package-Manager: portage-2.1.1

6 files changed, 51 insertions, 24 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/Manifest b/net-misc/clockspeed/Manifest
index 30a57917efef..58a64d49de76 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -6,23 +6,27 @@ AUX leapsecs.dat.20060525 184 RMD160 88d644904caa47d034730951d3f2052f5a96f10c SH
 MD5 5ecd5a2eaa39b7f0b6b328a3760c50b2 files/leapsecs.dat.20060525 184
 RMD160 88d644904caa47d034730951d3f2052f5a96f10c files/leapsecs.dat.20060525 184
 SHA256 4e69538d4b6ee92a2b79666f245476710c90cb8f266d58c752e7da0a3b9530d3 files/leapsecs.dat.20060525 184
-AUX ntpclockset 1165 RMD160 8096cdce5e6f495811826688c3aa8b5384d74c7d SHA1 a86ba54dcff35747d38531f129dcd022235f8408 SHA256 36fd81e53788e2ac081ae0e06d018ca415437b40643ea12b628abd949e44714b
-MD5 26a8d476ec6b18688879f86d442a0ced files/ntpclockset 1165
-RMD160 8096cdce5e6f495811826688c3aa8b5384d74c7d files/ntpclockset 1165
-SHA256 36fd81e53788e2ac081ae0e06d018ca415437b40643ea12b628abd949e44714b files/ntpclockset 1165
+AUX ntpclockset 1213 RMD160 aa4621d92bfaaa273dacc68d88cb9bbbb8f7021a SHA1 3e612ccf6dd5127707fa589c1a32b0271dfd9720 SHA256 cb975dd3a7aa47f92f8d3be817731c1d142c901616587ee62371456549cc1fc5
+MD5 a80a01edf496ae885fcb4215254f23a8 files/ntpclockset 1213
+RMD160 aa4621d92bfaaa273dacc68d88cb9bbbb8f7021a files/ntpclockset 1213
+SHA256 cb975dd3a7aa47f92f8d3be817731c1d142c901616587ee62371456549cc1fc5 files/ntpclockset 1213
 DIST clockspeed-0.62.tar.gz 25797 RMD160 c1c863ddd91b77554f6924438979cff58b351377 SHA1 333ede8961622ed3504e3df3deb64297aa52b0cf SHA256 43539964c4b554794b2da760d138c5975cbc850f1c8ec2ee96f5dba66e0d9eed
-EBUILD clockspeed-0.62-r3.ebuild 1102 RMD160 044de0237cde3734569c28add7f13a64fd82194b SHA1 ecd49a41815b4ffa89201711f1c115174232c5fb SHA256 653716c7c1b62665e1f4ca71b48260e036dd4f594a1e8f087247b5485f311254
-MD5 e9d4493e81f1c804b3577ad804bb78fb clockspeed-0.62-r3.ebuild 1102
-RMD160 044de0237cde3734569c28add7f13a64fd82194b clockspeed-0.62-r3.ebuild 1102
-SHA256 653716c7c1b62665e1f4ca71b48260e036dd4f594a1e8f087247b5485f311254 clockspeed-0.62-r3.ebuild 1102
-EBUILD clockspeed-0.62-r4.ebuild 1164 RMD160 99585ebd8405bdd5e7d3082ec3252762a3cff05b SHA1 decbc321456660cd8169a291d00c8f3a63b7ffe1 SHA256 6a0dd0e14df4159783d044d1f55649105a5ca73e829a37bb7478e1bfcbce4eef
-MD5 32a708ae7e2965d34ec58f87f8cebdb7 clockspeed-0.62-r4.ebuild 1164
-RMD160 99585ebd8405bdd5e7d3082ec3252762a3cff05b clockspeed-0.62-r4.ebuild 1164
-SHA256 6a0dd0e14df4159783d044d1f55649105a5ca73e829a37bb7478e1bfcbce4eef clockspeed-0.62-r4.ebuild 1164
-MISC ChangeLog 2590 RMD160 9dc12cc039d9639fcd264e3adc122158e02b70d4 SHA1 c6c034b14ed37c1c83186b735c2710481be297d6 SHA256 7c4f3b18274ebcd4c1f8cf43d7dd6bbbde4788de75ce15e51ae4b874c7a52e1c
-MD5 dcb1ac88f8f21ac24d9ad34a35f70d3a ChangeLog 2590
-RMD160 9dc12cc039d9639fcd264e3adc122158e02b70d4 ChangeLog 2590
-SHA256 7c4f3b18274ebcd4c1f8cf43d7dd6bbbde4788de75ce15e51ae4b874c7a52e1c ChangeLog 2590
+EBUILD clockspeed-0.62-r3.ebuild 1119 RMD160 34619b263232b32fe7c7b8ee4a06ac9867764621 SHA1 fb619930d4b20251249cfddf695af56cb24048b0 SHA256 29288a33972a883c17171a80748fe9073a9db3d48e03f59f6bdaa19da4ff3d7a
+MD5 a6a24e199d831887518f262334f88fd4 clockspeed-0.62-r3.ebuild 1119
+RMD160 34619b263232b32fe7c7b8ee4a06ac9867764621 clockspeed-0.62-r3.ebuild 1119
+SHA256 29288a33972a883c17171a80748fe9073a9db3d48e03f59f6bdaa19da4ff3d7a clockspeed-0.62-r3.ebuild 1119
+EBUILD clockspeed-0.62-r4.ebuild 1176 RMD160 fac51967bfd8e41309717af00df728e227561e39 SHA1 28ba9dac723e78e95e7e92185f7c1f833a3e143a SHA256 bcc594787c9576e9d334da7207917a71b68cd732031cbb619789868b7a703514
+MD5 113c0df61e8477a38d5c96e8e7884481 clockspeed-0.62-r4.ebuild 1176
+RMD160 fac51967bfd8e41309717af00df728e227561e39 clockspeed-0.62-r4.ebuild 1176
+SHA256 bcc594787c9576e9d334da7207917a71b68cd732031cbb619789868b7a703514 clockspeed-0.62-r4.ebuild 1176
+MISC ChangeLog 2907 RMD160 e14f87804ee4186d746ba6e0be9023b79c57561f SHA1 305e8536380f7fad5ace1d3956ab14e4c9371ba0 SHA256 6ce65d4870ef1e9ac5512aae0770d08517397a20903cbddbd9e0b15b39cfbfc0
+MD5 649397086f0951dbae41a235459bdd15 ChangeLog 2907
+RMD160 e14f87804ee4186d746ba6e0be9023b79c57561f ChangeLog 2907
+SHA256 6ce65d4870ef1e9ac5512aae0770d08517397a20903cbddbd9e0b15b39cfbfc0 ChangeLog 2907
+MISC metadata.xml 473 RMD160 ee04713145b690906794164dc03e1896a3069804 SHA1 e4efe8198c9ca82f394d1b9a23023f3085e6f3d7 SHA256 dbfb8ec52fa02f599c6e4b755f293a1a15e355c21af9acfcee6985a7dba8e306
+MD5 a11be3717b66f53c4753ffea833b0f53 metadata.xml 473
+RMD160 ee04713145b690906794164dc03e1896a3069804 metadata.xml 473
+SHA256 dbfb8ec52fa02f599c6e4b755f293a1a15e355c21af9acfcee6985a7dba8e306 metadata.xml 473
 MD5 ab71faa8013ab08a700a061402845540 files/digest-clockspeed-0.62-r3 244
 RMD160 8db4c1643bddcaba829a284a62a3e6db62891e8f files/digest-clockspeed-0.62-r3 244
 SHA256 01cd81d91a41297744eb38a39b7c66bb7223719c0e7baf079aca2af1b84923b1 files/digest-clockspeed-0.62-r3 244
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>