Version bump and add initial support for SATA drives #130330.

Package-Manager: portage-2.1.1_pre1-r2

6 files changed, 168 insertions, 125 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index a115378cb95a..891203ca63e7 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.77 2006/03/19 22:01:58 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.78 2006/06/25 04:43:52 vapier Exp $
+
+*hdparm-6.6 (25 Jun 2006)
+
+  25 Jun 2006; Mike Frysinger <vapier@gentoo.org> files/hdparm-init-7,
+  files/hdparm-conf.d.3, +hdparm-6.6.ebuild:
+  Version bump and add initial support for SATA drives #130330.
 
   19 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> hdparm-6.3.ebuild:
   Stable on alpha as per bug #125656
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 0b17d55748a1..2e8570361632 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,62 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX hdparm-conf.d.3 327 RMD160 2b3e0f38a748b57fcc8d5624a931d4a148d707a7 SHA1 5a86cc7149dcb80c8f2f598801c0758ffe629b45 SHA256 9e10f9d8eb9971207d89e2d14709d0f19ba7061b1239f57924348015784aa89a size 327
-MD5 35393ff70cd0030c94e6355281ed7f62 files/hdparm-conf.d.3 327
-RMD160 2b3e0f38a748b57fcc8d5624a931d4a148d707a7 files/hdparm-conf.d.3 327
-SHA256 9e10f9d8eb9971207d89e2d14709d0f19ba7061b1239f57924348015784aa89a files/hdparm-conf.d.3 327
-AUX hdparm-init-7 2724 RMD160 4b9b4c2664fe44cc07955ee18182863cc0c9034d SHA1 b5da3128cf756b3e6abfc37d46009120620bd19a SHA256 a76a193d9bb54ead30d61cc829a023b4d32e24a92195eea318b3c11af6ce9470 size 2724
-MD5 7f5a5fa02b1f15d3c0de76bf5abff70d files/hdparm-init-7 2724
-RMD160 4b9b4c2664fe44cc07955ee18182863cc0c9034d files/hdparm-init-7 2724
-SHA256 a76a193d9bb54ead30d61cc829a023b4d32e24a92195eea318b3c11af6ce9470 files/hdparm-init-7 2724
-DIST hdparm-5.7.tar.gz 38638 size 38638
-DIST hdparm-5.9.tar.gz 38966 RMD160 17a033f81a445a78b5bd8158c454d3f9da6bd73b SHA256 fa376a0e2a0a5648d6050bf3155577a324013ace44958c6917fccb98cff77cd6 size 38966
-DIST hdparm-6.1.tar.gz 40660 RMD160 de90f4b30da24b9f0dadbc1e0ad440f2c36ed098 SHA256 2e599fec7523f8913bae1eaab743095e54ae9b9898e2a6de55706d8860c33935 size 40660
-DIST hdparm-6.3.tar.gz 44052 RMD160 dff66236938b7d3f60fe43505b4c0d8f4dce2386 SHA256 08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d size 44052
-EBUILD hdparm-5.7-r1.ebuild 1092 RMD160 9dc7057c062a101230685b501eea4a1d3738d725 SHA1 a16a0293e6a38883600629c8eac50e0df1f536e4 SHA256 d08256e2a0eb2f85c2d762f87877a68792cb6a2aa1c34740c1a58f500402997a size 1092
-MD5 e08f57b51abd6ee896b7df3255dcaa4a hdparm-5.7-r1.ebuild 1092
-RMD160 9dc7057c062a101230685b501eea4a1d3738d725 hdparm-5.7-r1.ebuild 1092
-SHA256 d08256e2a0eb2f85c2d762f87877a68792cb6a2aa1c34740c1a58f500402997a hdparm-5.7-r1.ebuild 1092
-EBUILD hdparm-5.9.ebuild 1055 RMD160 a35b833fdbc72c5410d39310536fde54c3cc4fba SHA1 deffac7726e97cc24c65fcc20acd2abd014f25fa SHA256 a4330100d33495e3dccf731bdb273bb212b8846e74d68b776c03fd1b8fa737ab size 1055
-MD5 423c35d3e91e973112859fc023c4bdbf hdparm-5.9.ebuild 1055
-RMD160 a35b833fdbc72c5410d39310536fde54c3cc4fba hdparm-5.9.ebuild 1055
-SHA256 a4330100d33495e3dccf731bdb273bb212b8846e74d68b776c03fd1b8fa737ab hdparm-5.9.ebuild 1055
-EBUILD hdparm-6.1.ebuild 988 RMD160 cc15bfdd1fc95dfca7a5150dc85df685a63a24c1 SHA1 29b7ce37f9d47130eedf1aae9379898c82f0d753 SHA256 52782fe546c879aece3ed3a567b897b378ae7ad5bf7aa48b36c61d334d8634fb size 988
-MD5 80ca0963812c5c976a84b5a843b48ece hdparm-6.1.ebuild 988
-RMD160 cc15bfdd1fc95dfca7a5150dc85df685a63a24c1 hdparm-6.1.ebuild 988
-SHA256 52782fe546c879aece3ed3a567b897b378ae7ad5bf7aa48b36c61d334d8634fb hdparm-6.1.ebuild 988
-EBUILD hdparm-6.3.ebuild 980 RMD160 11c3db030680e8b5c0276df08c0f15d34e580336 SHA1 31ebf531dd5145c33e641eccb806bd4e7cbaa976 SHA256 192af9cb347beb7b9ac72a280866ad845f7e6000af584b84ca15a28cba17665a size 980
+AUX hdparm-conf.d.3 430 RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 SHA1 994e932091e7a09136050b2b1a96c31850eee46d SHA256 e3d8ce9928385e25abd388cf2d169198e03129f41d3eca1f23c96fdbe54f3462
+MD5 7905eb90e421523aa0c7f32f3d16b1fe files/hdparm-conf.d.3 430
+RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 files/hdparm-conf.d.3 430
+SHA256 e3d8ce9928385e25abd388cf2d169198e03129f41d3eca1f23c96fdbe54f3462 files/hdparm-conf.d.3 430
+AUX hdparm-init-7 2948 RMD160 278076003405599e7b700928e0c814f7ff67978c SHA1 3346974794dd3f9a1819d4643b6993478d844a7e SHA256 5e30667292f051726b17bec3393c285ae52d8307b90ffed84b89ad1611fe66dd
+MD5 4b11b8e9112d6209b29b0953f046f4e7 files/hdparm-init-7 2948
+RMD160 278076003405599e7b700928e0c814f7ff67978c files/hdparm-init-7 2948
+SHA256 5e30667292f051726b17bec3393c285ae52d8307b90ffed84b89ad1611fe66dd files/hdparm-init-7 2948
+DIST hdparm-6.3.tar.gz 44052 RMD160 dff66236938b7d3f60fe43505b4c0d8f4dce2386 SHA256 08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
+DIST hdparm-6.6.tar.gz 45538 RMD160 714fbc5216bdb427c7e817649f3c4f5462620c13 SHA1 8d288e0c22d7ff5968f5fa507bbf56703b2f6ed9 SHA256 7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b
+EBUILD hdparm-6.3.ebuild 980 RMD160 11c3db030680e8b5c0276df08c0f15d34e580336 SHA1 31ebf531dd5145c33e641eccb806bd4e7cbaa976 SHA256 192af9cb347beb7b9ac72a280866ad845f7e6000af584b84ca15a28cba17665a
 MD5 e8e931391bb0319e89df797179cca9c7 hdparm-6.3.ebuild 980
 RMD160 11c3db030680e8b5c0276df08c0f15d34e580336 hdparm-6.3.ebuild 980
 SHA256 192af9cb347beb7b9ac72a280866ad845f7e6000af584b84ca15a28cba17665a hdparm-6.3.ebuild 980
-MISC ChangeLog 9902 RMD160 0498270efc34055c81a16ffdd232d41d69e2e635 SHA1 707b2ddb045c71b07939518b17bb7f04b1a377b4 SHA256 e1b4882eaaf10ef897849c31fcbcdba1d072ceb1e816b7f6a4e553635f8d5253 size 9902
-MD5 254aaaa072f85819ce7e6594f7580c93 ChangeLog 9902
-RMD160 0498270efc34055c81a16ffdd232d41d69e2e635 ChangeLog 9902
-SHA256 e1b4882eaaf10ef897849c31fcbcdba1d072ceb1e816b7f6a4e553635f8d5253 ChangeLog 9902
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
+EBUILD hdparm-6.6.ebuild 992 RMD160 f04efda4f3ae37a7538861fc51c18051a5394f86 SHA1 c66fbfee74b7f0115fd2611ba9d4e75aefaf97e8 SHA256 f0c41e39aeaaca4f121182794712a35e1ef63fe1493d0f65cf94d40d491f2847
+MD5 9379b2f705ade4ebd6ec66bb5057bbdc hdparm-6.6.ebuild 992
+RMD160 f04efda4f3ae37a7538861fc51c18051a5394f86 hdparm-6.6.ebuild 992
+SHA256 f0c41e39aeaaca4f121182794712a35e1ef63fe1493d0f65cf94d40d491f2847 hdparm-6.6.ebuild 992
+MISC ChangeLog 10111 RMD160 55288c5709be40db5fc17a29751a89029b1dc0cc SHA1 c615706f7043971ec706be0e259af25046e91c0f SHA256 37db41ad6eb5406aab16766c0f01066d336f8b8e103a702d1582fd4e53dc073c
+MD5 a1ba6a7a6a84628843e5a4748db3cfb1 ChangeLog 10111
+RMD160 55288c5709be40db5fc17a29751a89029b1dc0cc ChangeLog 10111
+SHA256 37db41ad6eb5406aab16766c0f01066d336f8b8e103a702d1582fd4e53dc073c ChangeLog 10111
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7-r1 61
-RMD160 20458f4144b4f2c52aac665e9944a52a5e1f6375 files/digest-hdparm-5.7-r1 61
-SHA256 7a685964e1f216bd95746421910d80f23839ef9866426a53fdd58fb544d943af files/digest-hdparm-5.7-r1 61
-size 61 files/digest-hdparm-5.7-r1 61
-MD5 8c539d23d0606baa9ec381c2a4c98e58 files/digest-hdparm-5.9 229
-RMD160 96e1e5d13ff505c206ea1e20dec72c6d51edd4ae files/digest-hdparm-5.9 229
-SHA256 24ad608bbe46489e3337f4e027f8c56012d35a2ed10b0e36ffdf0ae40a3599ac files/digest-hdparm-5.9 229
-size 229 files/digest-hdparm-5.9 229
-MD5 55151b2d0738f61a4c06913f0e571885 files/digest-hdparm-6.1 229
-RMD160 9aa95c3ede60f0c4f4f42472a3287276d4f8eca5 files/digest-hdparm-6.1 229
-SHA256 ab736130b993206ab4327a4dcd094e426059ea4ea9a56118ab682ca29e3def05 files/digest-hdparm-6.1 229
-size 229 files/digest-hdparm-6.1 229
 MD5 882aa5ddbac2d329d81f76d6a13c5113 files/digest-hdparm-6.3 229
 RMD160 03a78e46ae3cfac9923ffdc2f6c5607277ee9541 files/digest-hdparm-6.3 229
 SHA256 f9c6327dde970138354ae21b78ae185a76959ed9c68c244fa4cf160301ec4fde files/digest-hdparm-6.3 229
-size 229 files/digest-hdparm-6.3 229
+MD5 db8a24af1985ef02ad205c804546cfd7 files/digest-hdparm-6.6 229
+RMD160 0480c983825c9e85534e6c95fe723c383918f90a files/digest-hdparm-6.6 229
+SHA256 ffaad577c213d99ad547fddf0d22ad6e096114ff29fbca4d39216acc73ac0e46 files/digest-hdparm-6.6 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERXNN2+ySkm8kpY0RAosnAJ9lnGrD3zblvmEAXdQW/nJbFpWMkACfR+l+
-8QcucKJtdWEMjA+iRJjbMDU=
-=LhIl
+iD8DBQFEnhXPamhnQswr0vIRAgIwAKChuA6uhQYJ3HmI/GKRqsDDMQIc3gCffi3w
+37nPkVbzO5Iz7Z7NEYWAC80=
+=b5Sd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/files/digest-hdparm-6.6 b/sys-apps/hdparm/files/digest-hdparm-6.6
new file mode 100644
index 000000000000..6fc9620e21cc
--- /dev/null
+++ b/sys-apps/hdparm/files/digest-hdparm-6.6
@@ -0,0 +1,3 @@
+MD5 ecea69f775396e4ab6112dcf9066239f hdparm-6.6.tar.gz 45538
+RMD160 714fbc5216bdb427c7e817649f3c4f5462620c13 hdparm-6.6.tar.gz 45538
+SHA256 7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b hdparm-6.6.tar.gz 45538
diff --git a/sys-apps/hdparm/files/hdparm-conf.d.3 b/sys-apps/hdparm/files/hdparm-conf.d.3
index d47c205606fb..ae4c454a7b62 100644
--- a/sys-apps/hdparm/files/hdparm-conf.d.3
+++ b/sys-apps/hdparm/files/hdparm-conf.d.3
@@ -7,6 +7,11 @@
 # disc1_args="-d1"
 # cdrom0_args="-d1"
 
-# or, you can set hdparm options for ALL drives using all_args, e.g.
-#
-all_args="-d1"
+# or you can set options for all PATA drives
+pata_all_args="-d1"
+
+# or you can set options for all SATA drives
+sata_all_args=""
+
+# or, you can set hdparm options for all drives
+all_args=""
diff --git a/sys-apps/hdparm/files/hdparm-init-7 b/sys-apps/hdparm/files/hdparm-init-7
index 231d42021d47..559db1f389cd 100644
--- a/sys-apps/hdparm/files/hdparm-init-7
+++ b/sys-apps/hdparm/files/hdparm-init-7
@@ -25,7 +25,7 @@ depend() {
 }
 
 do_hdparm() {
-	if [[ ${args:=$all_args} ]] ; then
+	if [[ -n ${args:=${all_args} ${!extra_args}} ]] ; then
 		local orgdevice=$(readlink -f ${device})
 		if [[ -b ${orgdevice} ]] ; then
 			ebegin "Running hdparm on ${device}"
@@ -35,96 +35,105 @@ do_hdparm() {
 	fi
 }
 
-start() {
+scan_devfs() {
+	extra_args="pata_all_args"
 
-	if [ -e /dev/.devfs ] && [ -d /dev/ide ]
-	then
+	# devfs compatible systems
+	for device in $(find /dev/ide -name disc)
+	do
+		args=''
 
-		# devfs compatible systems
-		for device in $(find /dev/ide -name disc)
+		for alias in /dev/hd?
 		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
-
+			if [ $alias -ef $device ]
+			then
+				device=$alias
+				eval args=\${`basename $alias`_args}
+				break
+			fi
 		done
 
-		for device in $(find /dev/ide -name cd)
+		[ -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
 
-			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
 
-			do_hdparm
+	done
 
-		done
+	for device in $(find /dev/ide -name cd)
+	do
+
+		args=''
 
-		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)
+		for alias in /dev/hd?
 		do
-			eval args=\${generic${count}_args}
-			do_hdparm
-			let count=count+1
+			if [ $alias -ef $device ]
+			then
+				device=$alias
+				eval args=\${`basename $alias`_args}
+				break
+			fi
 		done
 
-	else
-
-		# non-devfs compatible system
-		for device in /dev/hd?
+		[ -z "$args" ] && for alias in /dev/cdroms/*
 		do
-			# check that the block device really exists
-			# by opening it for reading
-			local errmsg status
-			errmsg=$(: 2>&1 <$device)
-			status=$?
-			if [[ -b $device ]] && [[ ${status} == 0 || ${errmsg} == *": No medium found" ]]
+			if [ $alias -ef $device ]
 			then
-				eval args=\${`basename $device`_args}
-				do_hdparm
+				device=$alias
+				eval args=\${`basename $alias`_args}
+				break
 			fi
 		done
 
+		do_hdparm
+	done
+
+	local 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
+		((++count))
+	done
+}
+
+scan_nondevfs() {
+	# non-devfs compatible system
+	for device in /dev/hd? /dev/sd? ; do
+		case ${device} in
+			/dev/hd*)  extra_args="pata_all_args" ;;
+			/dev/sd*)  extra_args="sata_all_args" ;;
+			*)         extra_args="" ;;
+		esac
+
+		# check that the block device really exists by
+		# opening it for reading
+		local errmsg status
+		errmsg=$(: 2>&1 <$device)
+		status=$?
+		if [[ -b $device ]] && \
+		   [[ ${status} == 0 || ${errmsg} == *": No medium found" ]]
+		then
+			local conf_var="${device##*/}_args"
+			args=${!conf_var}
+			do_hdparm
+		fi
+	done
+}
+
+start() {
+	if [[ -e /dev/.devfs ]] && [[ -d /dev/ide ]] ; then
+		scan_devfs
+	else
+		scan_nondevfs
 	fi
 }
diff --git a/sys-apps/hdparm/hdparm-6.6.ebuild b/sys-apps/hdparm/hdparm-6.6.ebuild
new file mode 100644
index 000000000000..19bad8fa6bc6
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-6.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-6.6.ebuild,v 1.1 2006/06/25 04:43:52 vapier Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="http://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		Makefile || die "sed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "compile error"
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl || die "dosbin"
+
+	newinitd "${FILESDIR}"/hdparm-init-7 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+}