major cleanup

3 files changed, 7 insertions, 86 deletions

diff --git a/sys-apps/noflushd/files/digest-noflushd-2.4 b/sys-apps/noflushd/files/digest-noflushd-2.4
deleted file mode 100644
index aacb22f941a8..000000000000
--- a/sys-apps/noflushd/files/digest-noflushd-2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b248ff04030ffa79a14ef76f3d0ff8f0 noflushd_2.4.orig.tar.gz
diff --git a/sys-apps/noflushd/noflushd-2.4-r1.ebuild b/sys-apps/noflushd/noflushd-2.4-r1.ebuild
index 2cd6c3c6d252..a1dbab980de1 100644
--- a/sys-apps/noflushd/noflushd-2.4-r1.ebuild
+++ b/sys-apps/noflushd/noflushd-2.4-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r1.ebuild,v 1.3 2001/08/30 05:32:18 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r1.ebuild,v 1.4 2001/08/30 18:35:27 danarmak Exp $
 # Note: the daemon's current 2.4 version has nothing to do with kernel versions
 
-#P=""
 A=noflushd_2.4.orig.tar.gz
 S=${WORKDIR}/${P}.orig
 SRC_URI="http://download.sourceforge.net/noflushd/${A}"
@@ -43,13 +42,7 @@ src_install () {
     doexe ${FILESDIR}/noflushd
     
     insinto /etc/rc.d/config
-    # update from previous (-r0) location of config file
-    if [ -x /etc/noflushd.conf ] ;
-    then
-	doins /etc/noflushd.conf
-    else
-        doins ${FILESDIR}/noflushd.conf
-    fi
+    doins ${FILESDIR}/noflushd.conf
     
 }
 
@@ -58,23 +51,16 @@ pkg_postinst() {
     echo "
     Run 'rc-update add noflushd' to add it to runlevels 2 3 4.
 
-    Edit /etc/noflushd.conf to change the default spindown
+    Edit /etc/rc.d/config/noflushd.conf to change the default spindown
     timeout and the disks handled; the defaults are 60 minutes
     and /dev/discs/disc0/disc (i.e. hda).
+	
+	Updaters from early versions of ebuild (r0): note new location
+	of config file (now in /etc/rc.d/config, previously in /etc).
     
-    NOTE FOR UPDATE:
-    The original version of this ebuild used /etc/env.d/70noflushd
-    for settings, the next version used /etc/noflushd.conf, and finally
-    this new version (-r1) uses /etc/rc.d/config/noflushd.conf. If you 
-    had a config file in the previous location and none in the new one,
-    it will have been copied to the new one (the syntax is identical).
-    
-    If you updated, you MUST go to /etc/rc.d/init.d and replace the old
-    noflushd init script with the new one if you have the default config
-    dir protection!
-
     WARNING:
     WARNING: Do NOT use with SCSI, unstable!
+    WARNING: Has possible problems with reiserfs, too.
     WARNING:
     "
     
diff --git a/sys-apps/noflushd/noflushd-2.4.ebuild b/sys-apps/noflushd/noflushd-2.4.ebuild
deleted file mode 100644
index 10d633b49e78..000000000000
--- a/sys-apps/noflushd/noflushd-2.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4.ebuild,v 1.3 2001/08/02 19:59:33 danarmak Exp $
-# Note: the daemon's current 2.4 version has nothing to do with kernel versions
-
-#P=""
-A=noflushd_2.4.orig.tar.gz
-S=${WORKDIR}/${P}.orig
-SRC_URI="http://download.sourceforge.net/noflushd/${A}"
-
-HOMEPAGE="http://noflushd.sourceforge.net"
-DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
-
-DEPEND=""
-
-src_compile() {
-    
-    confopts="--infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} --with-docdir=/usr/share/doc/${P}"
-    
-    try ./configure ${confopts}
-    
-    try emake
-
-}
-
-src_install () {
-    
-    # The orig. noflushd includes startup scripts for suse, debian and redhat.
-    # It detects gentoo as redhat (at least here it does), and in any case
-    # we don't want any of its rc.d scripts, so we install manually. There's
-    # only one binary and the docs.
-    
-    cd ${S}
-    
-    into /usr
-    dosbin src/noflushd
-    doman man/noflushd.8
-    
-    dodoc README NEWS
-    
-    exeinto /etc/rc.d/init.d
-    doexe ${FILESDIR}/noflushd
-    
-    insinto /etc
-    doins ${FILESDIR}/noflushd.conf
-    
-}
-
-pkg_postinst() {
-    
-    echo "
-    Run 'rc-update add noflushd' to add it to runlevels 2 3 4.
-
-    Edit /etc/noflushd.conf to change the default spindown
-    timeout and the disks handled; the defaults are 60 minutes
-    and /dev/discs/disc0/disc (i.e. hda).
-
-    WARNING:
-    WARNING: Do NOT use with SCSI, unstable!
-    WARNING:
-    "
-    
-}
\ No newline at end of file