Version bump #116979 by Michael Cramer and fix init.d script for cdrom devices #104683 by Heiko Baums / Stefan Illner.

Package-Manager: portage-2.1_pre2

5 files changed, 76 insertions, 20 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index 5dfe319cbbdd..5657602164ce 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.70 2005/09/26 21:40:29 matsuu Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.71 2005/12/28 20:49:39 vapier Exp $
+
+*hdparm-6.3 (28 Dec 2005)
+
+  28 Dec 2005; Mike Frysinger <vapier@gentoo.org> files/hdparm-init-7,
+  +hdparm-6.3.ebuild:
+  Version bump #116979 by Michael Cramer and fix init.d script for cdrom
+  devices #104683 by Heiko Baums / Stefan Illner.
 
   26 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> hdparm-5.9.ebuild:
   Stable on sh.
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index ebc6cf4697d3..c4265183c93f 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e45f6eb3323ab5cbe4b8c8a8a41b7ee4 ChangeLog 9306
+MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7-r1 61
+MD5 f76a3e6a488511f6064448be47b6ae47 files/digest-hdparm-5.9 61
+MD5 9bab2bbbb6f1f3d23a72da1834b7ce64 files/digest-hdparm-6.1 61
+MD5 67b0d8f805a4eb00c9eb9ff568917ee4 files/digest-hdparm-6.3 61
+MD5 5246893ec7894ece9bf7a851d11fa18d files/hdparm-conf.d.3 491
+MD5 886477fb129536e915134e7a039038b2 files/hdparm-init-7 2674
 MD5 e08f57b51abd6ee896b7df3255dcaa4a hdparm-5.7-r1.ebuild 1092
 MD5 423c35d3e91e973112859fc023c4bdbf hdparm-5.9.ebuild 1055
-MD5 d183370a379aac7e5c5d277e8e642a76 ChangeLog 9062
 MD5 80ca0963812c5c976a84b5a843b48ece hdparm-6.1.ebuild 988
+MD5 4f142070b32f00d367970a03672529cf hdparm-6.3.ebuild 988
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f76a3e6a488511f6064448be47b6ae47 files/digest-hdparm-5.9 61
-MD5 9bab2bbbb6f1f3d23a72da1834b7ce64 files/digest-hdparm-6.1 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDsvp/2+ySkm8kpY0RAuB5AKCOWgO/3YyX2iBFuHQGACTsPY530QCfc8+r
+JcnIo8AvqjUrxCz2KC8BzMI=
+=+SwY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/files/digest-hdparm-6.3 b/sys-apps/hdparm/files/digest-hdparm-6.3
new file mode 100644
index 000000000000..e01d72f6dfcd
--- /dev/null
+++ b/sys-apps/hdparm/files/digest-hdparm-6.3
@@ -0,0 +1 @@
+MD5 0c12672f3a09c14ad0b0882f15fc9389 hdparm-6.3.tar.gz 44052
diff --git a/sys-apps/hdparm/files/hdparm-init-7 b/sys-apps/hdparm/files/hdparm-init-7
index e503928b8449..de40beb6342a 100644
--- a/sys-apps/hdparm/files/hdparm-init-7
+++ b/sys-apps/hdparm/files/hdparm-init-7
@@ -25,23 +25,18 @@ depend() {
 }
 
 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"
+	if [[ ${args:=$all_args} ]] ; then
+		local orgdevice=$(readlink -f ${device})
+		if [[ -b ${orgdevice} ]] ; then
+			ebegin "Running hdparm on ${device}"
+			hdparm ${args} ${device} > /dev/null
+			eend $?
 		fi
 	fi
 }
 
 start() {
 
-	ebegin 'Starting hdparm'
-
-	which hdparm &>/dev/null
-	eend $? 'hdparm executable not found'
-
 	if [ -d /dev/ide ]
 	then
 
@@ -121,7 +116,8 @@ start() {
 		do
 			# check that the block device really exists
 			# by opening it for reading
-			if [ -b $device ] && ( : <$device ) 2>/dev/null
+			local errmsg=$( : 2>/dev/null <$device )
+			if [[ -b $device ]] && [[ $? == 0 || $(errmsg) == "*: No medium found" ]]
 			then
 				eval args=\${`basename $device`_args}
 				do_hdparm
diff --git a/sys-apps/hdparm/hdparm-6.3.ebuild b/sys-apps/hdparm/hdparm-6.3.ebuild
new file mode 100644
index 000000000000..f066a19f5a5c
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-6.3.ebuild
@@ -0,0 +1,40 @@
+# 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-6.3.ebuild,v 1.1 2005/12/28 20:49:39 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
+}