cleanups

(Portage version: 2.0.51-r15)

6 files changed, 6 insertions, 198 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index 216251feb6f2..4a15c67c214b 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.60 2005/02/19 20:50:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.61 2005/02/19 20:53:46 lanius Exp $
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  -files/hdparm-5.4-readahead_rename.patch, -files/hdparm-conf.d,
+  -files/hdparm-init-2, -hdparm-5.4.ebuild:
+  cleanups
 
   19 Feb 2005; Markus Rothe <corsair@gentoo.org> hdparm-5.7-r1.ebuild:
   Stable on ppc64
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.4 b/sys-apps/hdparm/files/digest-hdparm-5.4
deleted file mode 100644
index b4a5e0b52382..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6c11d0e7a6b80704cb79970086ea787 hdparm-5.4.tar.gz 36013
diff --git a/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch b/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch
deleted file mode 100644
index 8474cdd46791..000000000000
--- a/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4-orig/hdparm.c hdparm-5.4/hdparm.c
---- hdparm-5.4-orig/hdparm.c	2003-04-18 20:29:38.000000000 +0000
-+++ hdparm-5.4/hdparm.c	2004-02-09 00:47:01.190595128 +0000
-@@ -52,7 +52,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
-+static unsigned long set_readahead= 0, get_readahead= 0, doreadahead= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
-@@ -785,8 +785,8 @@
- 
- 	if (set_readahead) {
- 		if (get_readahead)
--			printf(" setting fs readahead to %ld\n", readahead);
--		if (ioctl(fd, BLKRASET, readahead)) 
-+			printf(" setting fs readahead to %ld\n", doreadahead);
-+		if (ioctl(fd, BLKRASET, doreadahead)) 
- 			perror(" BLKRASET failed");
- 	}
- #ifdef HDIO_UNREGISTER_HWIF
-@@ -1830,7 +1830,7 @@
- 					case 'a':
- 						get_readahead = noisy;
- 						noisy = 1;
--						GET_NUMBER(set_readahead,readahead);
-+						GET_NUMBER(set_readahead,doreadahead);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;
diff --git a/sys-apps/hdparm/files/hdparm-conf.d b/sys-apps/hdparm/files/hdparm-conf.d
deleted file mode 100644
index 3da42175f069..000000000000
--- a/sys-apps/hdparm/files/hdparm-conf.d
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-conf.d,v 1.4 2004/09/06 02:17:08 swegener Exp $
-
-# You can either set hdparm arguments for each drive using disc*_args and cdrom*_args..
-# eg.
-# disc0_args="-d1 -X66"
-# disc1_args="-d1"
-# cdrom0_args="-d1"
-
-# Or, you can set hdparm options for ALL drives using all_args..
-# eg.
-# this mimics the behavior of the current script
-all_args="-d1"
diff --git a/sys-apps/hdparm/files/hdparm-init-2 b/sys-apps/hdparm/files/hdparm-init-2
deleted file mode 100644
index ba9bd607492e..000000000000
--- a/sys-apps/hdparm/files/hdparm-init-2
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Copyright 2003 Justin "Nagash" Jones
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-init-2,v 1.1 2004/08/01 14:43:43 lanius Exp $
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	drives=""
-	cdroms=""
-
-	for i in `dir /dev/discs 2>/dev/null`
-	do
-		if [ ! -n "`ls -la /dev/discs/${i} | grep scsi`" ]
-		then
-			all_discs="${all_discs} `basename ${i}`"
-		elif [ -n "${all_args}" ]
-		then
-			ewarn "Skipping $i hdparm does not support SCSI devices."
-		fi
-	done
-	for i in `dir /dev/cdroms 2>/dev/null`
-	do	
-		if [ ! -n "`ls -la /dev/cdroms/${i} | grep scsi`" ]
-		then
-			all_cdroms="${all_cdroms} `basename ${i}`"
-		elif [ -n "${all_args}" ]
-		then
-			ewarn "Skipping $i hdparm does not support SCSI devices."
-		fi
-	done
-
-	for i in ${all_discs}
-	do
-		tmp_args=${i}_args
-		eval hd_args=\$${tmp_args}
-
-		if [ -n "${hd_args}" ]
-		then
-			drives="$drives $i"
-		fi
-	done
-
-	for i in ${all_cdroms}
-	do
-		tmp_args=${i}_args
-		eval hd_args=\$${tmp_args}
-
-		if [ -n "${hd_args}" ]
-		then
-			cdroms="$cdroms $i"
-		fi
-	done
-}
-
-start() {
-	ebegin "Starting hdparm"
-	checkconfig
-	
-	if [ -n "${all_args}" ]
-	then	
-		for i in ${all_discs}
-		do
-			ebegin "Running hdparm on ${i}"
-			hdparm ${all_args} /dev/discs/${i}/disc &> /dev/null
-			eend $? "Failed to start hdparm on ${i}."
-		done
-
-		for i in ${all_cdroms}
-		do
-			ebegin "Running hdparm on ${i}"
-			hdparm ${all_args} /dev/cdroms/${i} &> /dev/null
-			eend $? "Failed to start hdparm on ${i}."
-		done
-	else
-		for i in ${drives}
-		do
-			tmp_args=${i}_args
-			eval hd_args=\$$tmp_args
-			ebegin "Running hdparm on ${i}"
-			hdparm $hd_args /dev/discs/${i}/disc &> /dev/null
-			eend $? "Failed to start hdparm on ${i}."
-		done
-
-		for i in ${cdroms}
-		do
-			tmp_args=${i}_args
-			eval hd_args=\$$tmp_args
-			ebegin "Running hdparm on ${i}"
-			hdparm $hd_args /dev/cdroms/${i} &> /dev/null
-			eend $? "Failed to start hdparm on ${i}."
-		done
-	fi
-
-	eend $? "Failed to start hdparm."
-}
-
-stop() {
-	ebegin "Stopping hdparm"
-	eend $? "Failed to stop hdparm."
-}
diff --git a/sys-apps/hdparm/hdparm-5.4.ebuild b/sys-apps/hdparm/hdparm-5.4.ebuild
deleted file mode 100644
index cfd09f40bb57..000000000000
--- a/sys-apps/hdparm/hdparm-5.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.4.ebuild,v 1.16 2005/01/02 23:20:31 ciaranm Exp $
-
-inherit eutils
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa ~amd64 ia64 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-readahead_rename.patch
-}
-
-src_compile() {
-	emake || die "compile error"
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hdparm-init-2 hdparm
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/hdparm-conf.d hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-}
-
-pkg_postinst() {
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-}