summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/adjtime/ChangeLog10
-rw-r--r--sys-apps/adjtime/Manifest18
-rw-r--r--sys-apps/adjtime/adjtime-0.4-r1.ebuild40
-rw-r--r--sys-apps/adjtime/adjtime-0.4-r2.ebuild35
-rw-r--r--sys-apps/adjtime/files/adjtime.conf6
-rwxr-xr-xsys-apps/adjtime/files/adjtime.init15
-rw-r--r--sys-apps/adjtime/files/digest-adjtime-0.4-r2 (renamed from sys-apps/adjtime/files/digest-adjtime-0.4-r1)0
7 files changed, 57 insertions, 67 deletions
diff --git a/sys-apps/adjtime/ChangeLog b/sys-apps/adjtime/ChangeLog
index 6858e1490afb..9ebec3c09e5b 100644
--- a/sys-apps/adjtime/ChangeLog
+++ b/sys-apps/adjtime/ChangeLog
@@ -1,6 +1,14 @@
# 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.3 2006/01/25 08:48:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/adjtime/ChangeLog,v 1.4 2006/02/15 03:31:48 nerdboy Exp $
+
+*adjtime-0.4-r2 (15 Feb 2006)
+
+ 15 Feb 2006; Steve Arnold <nerdboy@gentoo.org> -files/adjtime.conf,
+ -files/adjtime.init, -adjtime-0.4-r1.ebuild, +adjtime-0.4-r2.ebuild:
+ updated RDEPEND atom (sanitized for cirianm's protection) and removed
+ init script and conf files (shell environment dorks up perl script
+ execution and I have no way of watching the boot process).
25 Jan 2006; Steve Arnold <nerdboy@gentoo.org> files/adjtime.pl:
updated to original script with only path change; not sure why a "which"
diff --git a/sys-apps/adjtime/Manifest b/sys-apps/adjtime/Manifest
index 51e9a615fd9a..b91bb2129708 100644
--- a/sys-apps/adjtime/Manifest
+++ b/sys-apps/adjtime/Manifest
@@ -1,7 +1,15 @@
-MD5 317dc3fc7c7b6aff0ee469de1261970d ChangeLog 871
-MD5 6ae2d582b82a4dd8f85e64c1466c8676 adjtime-0.4-r1.ebuild 1008
-MD5 2947b44650fb5fcc620b35ad052a0b0f files/adjtime.conf 167
-MD5 8485681a63e1459f61bab861391f2d33 files/adjtime.init 379
+MD5 b831445bfbd6a0ea7aa0e6b5b4c4ea12 ChangeLog 1247
+RMD160 c31652746a1f8ae72fc61665cabe346e8c1e4948 ChangeLog 1247
+SHA256 284e137aad285e533d1147d1080f36f247c580c3fad0925f8fc9511aa1104b2c ChangeLog 1247
+MD5 85bd735a9a9a155d33011d0c7bc3a55e adjtime-0.4-r2.ebuild 1156
+RMD160 eb1c3fda45d85f62d190850eb845472edf034100 adjtime-0.4-r2.ebuild 1156
+SHA256 8fbd9f5cc1cbb029c675518e01b4bde0bc34c13493720b7c0fe29ad2d5db9fa5 adjtime-0.4-r2.ebuild 1156
MD5 6214dd9d7bbaf37a89c5200bddb2d404 files/adjtime.pl 8535
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-adjtime-0.4-r1 0
+RMD160 f4dd4efa795f90729ed629fbac45ece227571f59 files/adjtime.pl 8535
+SHA256 bd8c74c1ceb595fdb9aeac6586812a85a1c8712dcd1abfaf2f0e9d838d7b6c2c files/adjtime.pl 8535
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-adjtime-0.4-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-adjtime-0.4-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-adjtime-0.4-r2 0
MD5 583413c267e514ed42e788dfa43f31d5 metadata.xml 403
+RMD160 5ff777b41ca627ad200a95918fc9e38c36bb2961 metadata.xml 403
+SHA256 5470ba8232063ff6d7a6e8e39e425c395b45553bce6b92980f7abdda1ae005c0 metadata.xml 403
diff --git a/sys-apps/adjtime/adjtime-0.4-r1.ebuild b/sys-apps/adjtime/adjtime-0.4-r1.ebuild
deleted file mode 100644
index 5c4fa4a86dfa..000000000000
--- a/sys-apps/adjtime/adjtime-0.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-r1.ebuild,v 1.1 2006/01/22 22:36:50 nerdboy Exp $
-
-inherit eutils
-
-DESCRIPTION="A script to adjust the clock tick on the Kurobox and LinkStation hardware clock."
-HOMEPAGE="http://groups.yahoo.com/group/LinkStation_General/"
-#SRC_URI="http://dev.gentoo.org~/nerdboy/${P}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- >=net-misc/ntp-4.2*"
-
-src_install() {
- dodir /usr/sbin
- dosbin ${FILESDIR}/adjtime.pl || die
- dodir /etc/init.d
- newinitd "${FILESDIR}/adjtime.init" adjtime || die
- dodir /etc/conf.d
- newconfd "${FILESDIR}/adjtime.conf" adjtime || die
-}
-
-pkg_postinst() {
- if [ "${ROOT}" = "/" ] \
- && [ ! -f /etc/runlevels/default/adjtime ] ; then
- rc-update add adjtime default
- fi
-}
-
-pkg_postrm() {
- if [ "${ROOT}" = "/" ] \
- && [ ! -f /usr/sbin/adjtime ] ; then
- rc-update del adjtime default
- fi
-}
diff --git a/sys-apps/adjtime/adjtime-0.4-r2.ebuild b/sys-apps/adjtime/adjtime-0.4-r2.ebuild
new file mode 100644
index 000000000000..60dd705d9b98
--- /dev/null
+++ b/sys-apps/adjtime/adjtime-0.4-r2.ebuild
@@ -0,0 +1,35 @@
+# 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-r2.ebuild,v 1.1 2006/02/15 03:31:48 nerdboy Exp $
+
+DESCRIPTION="A script to adjust the clock tick on the Kurobox and LinkStation hardware clock."
+HOMEPAGE="http://groups.yahoo.com/group/LinkStation_General/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="ppc"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ =net-misc/ntp-4.2.0*"
+
+src_install() {
+ dodir /usr/sbin
+ dosbin ${FILESDIR}/adjtime.pl || die
+}
+
+pkg_postinst() {
+ ewarn "There have been issues with running adjtime as an init script"
+ ewarn "(the shell environment for perl is dorked up). The suggested"
+ ewarn "method is to use ntp-date rather than ntpd at startup, and"
+ ewarn "add the following two lines to local.start instead:"
+ einfo
+ einfo "/usr/bin/perl /usr/sbin/adjtime.pl -v -s ntp_host -i 60"
+ einfo
+ einfo "/etc/init.d/ntpd start"
+ einfo
+ einfo "replacing ntp_host with your preferred ntp server. Remember,"
+ einfo "since adjtime uses ntp-date, ntpd must be stopped (or not yet"
+ einfo "started) prior to running the adjtime script."
+}
+
diff --git a/sys-apps/adjtime/files/adjtime.conf b/sys-apps/adjtime/files/adjtime.conf
deleted file mode 100644
index aa78fe110a02..000000000000
--- a/sys-apps/adjtime/files/adjtime.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/adjtime
-
-# Set to the hostname of your favorite machine running NTP.
-# Read the comments in /usr/sbin/adjtime.pl for more info.
-
-NTP_HOST="ntp.ucsd.edu"
diff --git a/sys-apps/adjtime/files/adjtime.init b/sys-apps/adjtime/files/adjtime.init
deleted file mode 100755
index e31a7bf8e896..000000000000
--- a/sys-apps/adjtime/files/adjtime.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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.2 2006/01/22 22:36:50 nerdboy Exp $
-
-depend() {
- need net
- before ntpd
-}
-
-start() {
- echo 'Adjusting clock tick...'
- /usr/sbin/adjtime.pl -v -s $NTP_HOST -i 60
- eend $?
-}
diff --git a/sys-apps/adjtime/files/digest-adjtime-0.4-r1 b/sys-apps/adjtime/files/digest-adjtime-0.4-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-apps/adjtime/files/digest-adjtime-0.4-r1
+++ b/sys-apps/adjtime/files/digest-adjtime-0.4-r2