summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/adjtime/ChangeLog8
-rw-r--r--sys-apps/adjtime/Manifest10
-rw-r--r--sys-apps/adjtime/adjtime-0.4-r1.ebuild (renamed from sys-apps/adjtime/adjtime-0.4.ebuild)5
-rwxr-xr-xsys-apps/adjtime/files/adjtime.init4
-rw-r--r--sys-apps/adjtime/files/adjtime.pl4
-rw-r--r--sys-apps/adjtime/files/digest-adjtime-0.4-r1 (renamed from sys-apps/adjtime/files/digest-adjtime-0.4)0
6 files changed, 20 insertions, 11 deletions
diff --git a/sys-apps/adjtime/ChangeLog b/sys-apps/adjtime/ChangeLog
index 5ddf95b11234..406eda111720 100644
--- a/sys-apps/adjtime/ChangeLog
+++ b/sys-apps/adjtime/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/adjtime
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/ChangeLog,v 1.1 2006/01/21 23:21:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/ChangeLog,v 1.2 2006/01/22 22:36:50 nerdboy Exp $
+
+*adjtime-0.4-r1 (22 Jan 2006)
+
+ 22 Jan 2006; Steve Arnold <nerdboy@gentoo.org> files/adjtime.init,
+ files/adjtime.pl, -adjtime-0.4.ebuild, +adjtime-0.4-r1.ebuild:
+ updated scripts and added ntp dependency (bug 119917)
*adjtime-0.4 (21 Jan 2006)
diff --git a/sys-apps/adjtime/Manifest b/sys-apps/adjtime/Manifest
index fda86d84c1cf..dfd8e70c2a9e 100644
--- a/sys-apps/adjtime/Manifest
+++ b/sys-apps/adjtime/Manifest
@@ -1,7 +1,7 @@
-MD5 c904594e30fe4939e2f45b9b14ce297b ChangeLog 466
-MD5 ba75f37528e15ab126c6ff28d1e0e822 adjtime-0.4.ebuild 984
+MD5 c9b27a517d47f25671fef8478e3479df ChangeLog 688
+MD5 40c840ec9dde588fab2dee5f81d48c0c adjtime-0.4-r1.ebuild 1005
MD5 2947b44650fb5fcc620b35ad052a0b0f files/adjtime.conf 167
-MD5 8efb4a24580f52714e4065770d0f0251 files/adjtime.init 375
-MD5 1933f57cad4cdf6f8ae7e38fa0535cce files/adjtime.pl 8536
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-adjtime-0.4 0
+MD5 1972ed0018b80731b958ecc17638afe6 files/adjtime.init 379
+MD5 833592d3d317e04b6aff1391598b0883 files/adjtime.pl 8604
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-adjtime-0.4-r1 0
MD5 583413c267e514ed42e788dfa43f31d5 metadata.xml 403
diff --git a/sys-apps/adjtime/adjtime-0.4.ebuild b/sys-apps/adjtime/adjtime-0.4-r1.ebuild
index 0c56e3d3971d..5c4fa4a86dfa 100644
--- a/sys-apps/adjtime/adjtime-0.4.ebuild
+++ b/sys-apps/adjtime/adjtime-0.4-r1.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/sys-apps/adjtime/adjtime-0.4.ebuild,v 1.1 2006/01/21 23:21:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/adjtime-0.4-r1.ebuild,v 1.1 2006/01/22 22:36:50 nerdboy Exp $
inherit eutils
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="ppc"
IUSE=""
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl
+ >=net-misc/ntp-4.2*"
src_install() {
dodir /usr/sbin
diff --git a/sys-apps/adjtime/files/adjtime.init b/sys-apps/adjtime/files/adjtime.init
index 302f5561ae5d..e31a7bf8e896 100755
--- a/sys-apps/adjtime/files/adjtime.init
+++ b/sys-apps/adjtime/files/adjtime.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/files/adjtime.init,v 1.1 2006/01/21 23:21:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/files/adjtime.init,v 1.2 2006/01/22 22:36:50 nerdboy Exp $
depend() {
need net
@@ -10,6 +10,6 @@ depend() {
start() {
echo 'Adjusting clock tick...'
- /sbin/adjtime.pl -v -s $NTP_HOST -i 60
+ /usr/sbin/adjtime.pl -v -s $NTP_HOST -i 60
eend $?
}
diff --git a/sys-apps/adjtime/files/adjtime.pl b/sys-apps/adjtime/files/adjtime.pl
index e03e3eec548f..2cf24dbc7198 100644
--- a/sys-apps/adjtime/files/adjtime.pl
+++ b/sys-apps/adjtime/files/adjtime.pl
@@ -219,10 +219,12 @@ sub get_offset { # ()
sub get_tickadj { # ($)
+ my $TICKADJ = (`which tickadj`);
+ printf STDERR "Using %s", $TICKADJ;
my ($tick) = @_;
$tick = '' unless defined($tick);
- foreach my $line (`/usr/sbin/tickadj $tick`) {
+ foreach my $line (`$TICKADJ $tick`) {
printf STDERR "DEBUG: [%s]\n", $line if $DEBUG;
return $1 if $line =~ m/^tick\s+=\s+(\d+)\s*$/i;
}
diff --git a/sys-apps/adjtime/files/digest-adjtime-0.4 b/sys-apps/adjtime/files/digest-adjtime-0.4-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-apps/adjtime/files/digest-adjtime-0.4
+++ b/sys-apps/adjtime/files/digest-adjtime-0.4-r1