cleanups, version bump

(Portage version: 2.0.51-r15)

14 files changed, 16 insertions, 351 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index 7ad483d8e8bb..6c6744d92dc4 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2005/01/02 23:20:31 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.59 2005/02/19 20:47:53 lanius Exp $
+
+*hdparm-5.9 (19 Feb 2005)
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> -files/hdparm-init-6,
+  -hdparm-5.5-r4.ebuild, -hdparm-5.5.ebuild, -hdparm-5.6.ebuild,
+  -hdparm-5.7.ebuild, -hdparm-5.8.ebuild, +hdparm-5.9.ebuild:
+  cleanups, version bump
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 110b4146bee0..33105e5b4f83 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,22 +1,14 @@
-MD5 9c90bbd98e3a7f88d1554914787e92be hdparm-5.6.ebuild 1230
-MD5 285268171ce6f1cbd4210dea59afc093 ChangeLog 7604
-MD5 39bd055cdf81d3b279cf2a812c11f389 hdparm-5.7.ebuild 1231
 MD5 f456a7cc5ba9f6b9d04f2ac65826df14 hdparm-5.7-r1.ebuild 1248
+MD5 b85171627fd787326a28a556808c1fe7 hdparm-5.9.ebuild 1235
 MD5 83d495c00592ff76ef5cf22856e2e7f1 hdparm-5.4.ebuild 1159
-MD5 b85171627fd787326a28a556808c1fe7 hdparm-5.8.ebuild 1235
-MD5 a6c257bbf0660081c6daff4c4d9cea7b hdparm-5.5.ebuild 1279
-MD5 47305efa8256d5e24d16d27c4d51ca0c hdparm-5.5-r4.ebuild 1285
+MD5 285268171ce6f1cbd4210dea59afc093 ChangeLog 7604
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 300982c72dc0f865d5ad6c542e3b6c4c files/digest-hdparm-5.4 61
+MD5 f76a3e6a488511f6064448be47b6ae47 files/digest-hdparm-5.9 61
+MD5 58b06c855068c6d95b0f665c201d6051 files/hdparm-5.4-readahead_rename.patch 1254
 MD5 82a65f0cc4df5c775215311866cacaee files/hdparm-conf.d 513
 MD5 dce31c3384bc0bf7baa99a850bd9494e files/hdparm-init-2 2126
-MD5 704901c1e04aede777875e6a1573f54a files/digest-hdparm-5.8 61
-MD5 5246893ec7894ece9bf7a851d11fa18d files/hdparm-conf.d.3 491
-MD5 54e0645b436384968aed6c895cea3289 files/digest-hdparm-5.6 61
-MD5 58b06c855068c6d95b0f665c201d6051 files/hdparm-5.4-readahead_rename.patch 1254
-MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7-r1 61
-MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7 61
-MD5 f5fc13fdfccb0f5600d45488c6a5d534 files/digest-hdparm-5.5-r4 61
 MD5 935116718ebf153586f84f587e22e950 files/hdparm-init-6 3398
-MD5 f5fc13fdfccb0f5600d45488c6a5d534 files/digest-hdparm-5.5 61
 MD5 f6e1664cbc73c956c98ba69f05c23615 files/hdparm-init-7 2708
+MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7-r1 61
+MD5 5246893ec7894ece9bf7a851d11fa18d files/hdparm-conf.d.3 491
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.5 b/sys-apps/hdparm/files/digest-hdparm-5.5
deleted file mode 100644
index f3fa36d6a5d7..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3d65aa96d93fc08bc807fd1d9497c21 hdparm-5.5.tar.gz 38215
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.5-r4 b/sys-apps/hdparm/files/digest-hdparm-5.5-r4
deleted file mode 100644
index f3fa36d6a5d7..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.5-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3d65aa96d93fc08bc807fd1d9497c21 hdparm-5.5.tar.gz 38215
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.6 b/sys-apps/hdparm/files/digest-hdparm-5.6
deleted file mode 100644
index 70d50b491dc2..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12f278dc740cb0543abc0737549f6400 hdparm-5.6.tar.gz 38770
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.7 b/sys-apps/hdparm/files/digest-hdparm-5.7
deleted file mode 100644
index 8e2c57e1effc..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bfb16ac78ca4af8b3e4e3b9fab28743 hdparm-5.7.tar.gz 38638
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.8 b/sys-apps/hdparm/files/digest-hdparm-5.8
deleted file mode 100644
index 8b295128ac49..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-5.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4187336bc79a8538549e18540313ffd hdparm-5.8.tar.gz 38911
diff --git a/sys-apps/hdparm/files/digest-hdparm-5.9 b/sys-apps/hdparm/files/digest-hdparm-5.9
new file mode 100644
index 000000000000..d7c6abd2c85f
--- /dev/null
+++ b/sys-apps/hdparm/files/digest-hdparm-5.9
@@ -0,0 +1 @@
+MD5 a270a01158981a8470d76b96f84e249a hdparm-5.9.tar.gz 38966
diff --git a/sys-apps/hdparm/files/hdparm-init-6 b/sys-apps/hdparm/files/hdparm-init-6
deleted file mode 100644
index e59db8f407ca..000000000000
--- a/sys-apps/hdparm/files/hdparm-init-6
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/sbin/runscript
-# METHOD
-# ------
-# if /dev/ide exists, find all block devices beneath it named disc, cd, or
-# generic.
-#
-# for the disc and cd ones, if there is a a matching /dev/hdX symlink and
-# hdX_args is set in the config file, use hdX_args.  otherwise, if there is a
-# matching /dev/discs/discX or /dev/cdroms/cdromX symlink, and discX_args or
-# cdromX_args is set in the config file, use discX_args / cdromX_args.  finally,
-# if all_args is set in the config file, use that.
-#
-# for the generic ones, sort them and look for genericX_args in the config file
-# or use all_args.
-#
-# if /dev/ide does not exist, check the /dev/hdX entries, and see which ones
-# correspond to real devices by opening them for reading.  then check hdX_args
-# and all_args in the config file.
-#
-# for each device considered, if no args are found in the config file, do not
-# run hdparm.
-
-depend() {
-    before bootmisc
-}
-
-do_hdparm() {
-    if [[ ${args:=$all_args} ]]
-    then
-		orgdevice=`readlink -f $device`
-		if [ -b $orgdevice ]; then
-	        ebegin "Running hdparm on $device"
-		    hdparm $args $device > /dev/null || ewarn "Failed to run hdparm on $device"
-		fi
-    fi
-}
-
-start() {
-
-    ebegin 'Starting hdparm'
-
-    which hdparm &>/dev/null
-    eend $? 'hdparm executable not found'
-
-    if [ -e /dev/.devfsd ] || [ -e /dev/.udev ]
-    then
-
-		# devfs and udev system
-        for device in $(find /dev/ide -name disc)
-        do
-
-            args=''
-
-            for alias in /dev/hd?
-            do
-                if [ $alias -ef $device ]
-                then
-                    device=$alias
-                    eval args=\${`basename $alias`_args}
-                    break
-                fi
-            done
-
-            [ -z "$args" ] && for alias in /dev/discs/*
-            do
-                if [ $alias/disc -ef $device ]
-                then
-                    device=$alias/disc
-                    eval args=\${`basename $alias`_args}
-                    break
-                fi
-            done
-
-            do_hdparm
-
-        done
-
-        for device in $(find /dev/ide -name cd)
-        do
-
-            args=''
-
-            for alias in /dev/hd?
-            do
-                if [ $alias -ef $device ]
-                then
-                    device=$alias
-                    eval args=\${`basename $alias`_args}
-                    break
-                fi
-            done
-
-			[ -z $args ] && for alias in /dev/cdroms/*
-            do
-                if [ $alias -ef $device ]
-				then
-                    device=$alias
-                    eval args=\${`basename $alias`_args}
-                    break
-                fi
-            done
-
-            do_hdparm
-
-        done
-
-        let count=0
-        # of course, the sort approach would fail here if any of the
-        # host/bus/target/lun numbers reached 2 digits..
-        for device in $(find /dev/ide -name generic | sort)
-        do
-            eval args=\${generic${count}_args}
-            do_hdparm
-            let count=count+1
-        done
-
-    else
-
-        # non-devfs system
-        for device in /dev/hd?
-        do
-            # check that the block device really exists
-            # by opening it for reading
-            if [ -b $device ] && ( : <$device ) 2>/dev/null
-            then
-                eval args=\${`basename $device`_args}
-                do_hdparm
-            fi
-        done
-
-    fi
-}
diff --git a/sys-apps/hdparm/hdparm-5.5-r4.ebuild b/sys-apps/hdparm/hdparm-5.5-r4.ebuild
deleted file mode 100644
index 5cacb948f67c..000000000000
--- a/sys-apps/hdparm/hdparm-5.5-r4.ebuild
+++ /dev/null
@@ -1,50 +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.5-r4.ebuild,v 1.3 2005/01/02 23:20:31 ciaranm Exp $
-
-inherit gcc 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 ~arm ~hppa ~amd64 ia64 ~ppc64 ~s390"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-5.4-readahead_rename.patch
-	sed -i \
-		-e "/^CC/s:gcc:$(gcc-getCC):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		Makefile || die
-}
-
-src_compile() {
-	emake || die "compile error"
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hdparm-init-6 hdparm
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/hdparm-conf.d.3 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"
-}
diff --git a/sys-apps/hdparm/hdparm-5.5.ebuild b/sys-apps/hdparm/hdparm-5.5.ebuild
deleted file mode 100644
index 9e070413e592..000000000000
--- a/sys-apps/hdparm/hdparm-5.5.ebuild
+++ /dev/null
@@ -1,50 +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.5.ebuild,v 1.10 2005/01/02 23:20:31 ciaranm Exp $
-
-inherit gcc 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 arm ~hppa amd64 ~ia64 ~ppc64 s390"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-5.4-readahead_rename.patch
-	sed -i \
-		-e "/^CC/s:gcc:$(gcc-getCC):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		Makefile || die
-}
-
-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"
-}
diff --git a/sys-apps/hdparm/hdparm-5.6.ebuild b/sys-apps/hdparm/hdparm-5.6.ebuild
deleted file mode 100644
index 19707a7b0dc7..000000000000
--- a/sys-apps/hdparm/hdparm-5.6.ebuild
+++ /dev/null
@@ -1,49 +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.6.ebuild,v 1.2 2005/01/02 23:20:31 ciaranm Exp $
-
-inherit gcc 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 ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "/^CC/s:gcc:$(gcc-getCC):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		Makefile || die
-}
-
-src_compile() {
-	emake || die "compile error"
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hdparm-init-6 hdparm
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/hdparm-conf.d.3 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"
-}
diff --git a/sys-apps/hdparm/hdparm-5.7.ebuild b/sys-apps/hdparm/hdparm-5.7.ebuild
deleted file mode 100644
index 978ca0c62f68..000000000000
--- a/sys-apps/hdparm/hdparm-5.7.ebuild
+++ /dev/null
@@ -1,49 +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.7.ebuild,v 1.2 2005/01/02 23:20:31 ciaranm Exp $
-
-inherit gcc 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 ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "/^CC/s:gcc:$(gcc-getCC):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		Makefile || die
-}
-
-src_compile() {
-	emake || die "compile error"
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hdparm-init-6 hdparm
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/hdparm-conf.d.3 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"
-}
diff --git a/sys-apps/hdparm/hdparm-5.8.ebuild b/sys-apps/hdparm/hdparm-5.9.ebuild
index 7529e0ab128a..ade3815c26e6 100644
--- a/sys-apps/hdparm/hdparm-5.8.ebuild
+++ b/sys-apps/hdparm/hdparm-5.9.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.3 2005/01/02 23:20:31 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.9.ebuild,v 1.1 2005/02/19 20:47:53 lanius Exp $
 
 inherit toolchain-funcs