version bump from bug #166166

Package-Manager: portage-2.2_rc42/cvs/Linux i686

4 files changed, 63 insertions, 14 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index 91e8151847f6..815e51916b57 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/hdapsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.11 2009/08/31 22:02:20 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.12 2009/10/14 22:03:26 bangert Exp $
+
+*hdapsd-20090401 (14 Oct 2009)
+
+  14 Oct 2009; Thilo Bangert <bangert@gentoo.org> +hdapsd-20090401.ebuild,
+  files/hdapsd.init:
+  version bump from bug #166166
 
   31 Aug 2009; Mike Auty <ikelos@gentoo.org> hdapsd-20060409.ebuild,
   hdapsd-20060409-r1.ebuild, hdapsd-20060409-r3.ebuild:
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index d271ca41b523..279e2a01bb30 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hdaps-Z60m.patch 352 RMD160 963be45785af235fa3e0d74d68d2e75fad663396 SHA1 317de158fdacdd379a94b0652b54ed48525a71bc SHA256 05b0def085f637bae8561a825d7ff3ffc51bdd33609b1520e2d30aa807f00016
 AUX hdapsd.conf 321 RMD160 5bb760d34bca3f5a12aeb057b78de7e2a9065bc3 SHA1 ade013dab6278a385b4658aad7e871b743380689 SHA256 22e1acf385427052a12858db005fd73d42d9f6818fb253b032cd326101df2e34
-AUX hdapsd.init 1268 RMD160 c69fb5d50fd849b078014086becab493b74c018f SHA1 4fb925dda42ad816c6b2868254136112f909e17f SHA256 cee0bc3ac76aab909abfe78db7054601a46959c3d1791232666b938f8d73f57d
+AUX hdapsd.init 1321 RMD160 5a02904b766a51c97c6974260816576cd4710beb SHA1 eee2035439fd31901634cee40c2812cb89edd42b SHA256 f55d5fbaab2ddbfd826dd2692197d4b7222065e728b1e3bc5ca8ec8863367de9
 DIST hdaps_protect-patches-1.tar.bz2 6179 RMD160 5b173034eebbbee598e01d45e5e76e2859c0a829 SHA1 7d79652ddc884b6619944a0d9ed70557e9c56779 SHA256 ab4192fa3a26497fe9fed63bfaedfebc74d288a85e7283b1bc338984be1133dd
 DIST hdaps_protect-patches-2.tar.bz2 10203 RMD160 899a109b58b7aa4949012cd447275d2f3957951e SHA1 67599f3c1a5daaa298f6f1d30168ab0f6c45f407 SHA256 59cfe2535f3d11d1fe54d3c6acb3d2471c461af7770816aeec02411566d38c4b
 DIST hdapsd-20060409.c.bz2 5253 RMD160 0b8d07a2612bd4888014913bd8810de664352bfb SHA1 df6c5bf28d4539e97bb1800a455a36cf690d4779 SHA256 e8e1788d485814cd294c33744b60265423d8971abf5ab50b037f05de2c710a21
+DIST hdapsd-20090401.tar.gz 95058 RMD160 e4840a4a6be24e8a950c6f6e6c5a2dc36604868e SHA1 0d6517d36a0da8d5e765e5bc3059bad5d19a7e72 SHA256 32979d58de4c54a7cc5671e7e7b4f0b653b659104faa9610433f8bb5dd4cef7a
 EBUILD hdapsd-20060409-r1.ebuild 2337 RMD160 e3362d2ac87503df8edd7016ad2e6a63f4a4673d SHA1 73be34ebdf551287ee4fe05b25d8954ce7bb1b57 SHA256 8f8a4141aade5c2d02c3c62d66a881ea6845a688b77cacb49c5684b9a93875ab
 EBUILD hdapsd-20060409-r3.ebuild 2779 RMD160 07f89313ee0610e4c5e0cb296f18bf5c5400b3da SHA1 8d5449ae6f46c6098b3d022790bb72999d81f30a SHA256 fc87855140cf8e77a62769ddb6c262d1262174dfa4ba994ed1322785b3860452
 EBUILD hdapsd-20060409.ebuild 2331 RMD160 a11c82cd4bb607e9b58de5debadcdaf477c4acbe SHA1 80402ff04bb6f86cbd43e142758bd04b7b21582c SHA256 366b12265be7774c8c87c9d01be196a641e473170fe657de7811d2f5292e1ece
-MISC ChangeLog 1992 RMD160 d41b1b9a3483cd09048eab55b0dce8847f2a4a4b SHA1 2199bd1deac9dce71c7146f250b0a9aaf43c62cb SHA256 e1642eb518b5877cc9cd60a0b51b7e8e736825f1bc4c399a64147427b1d97a2f
+EBUILD hdapsd-20090401.ebuild 1814 RMD160 ad46a0047fa91aa250fdabd99c1c0fd8f7a27944 SHA1 c56a89c10cae1b2faa5fa33df7d046522791c874 SHA256 3cbf87b79aabcfec515947c7eff988f54c460cb76e99fe1d3a426cf2ad4682e4
+MISC ChangeLog 2154 RMD160 ca0a6445987bbd99157b90fa20f212f9b9f21c1f SHA1 8bfb88e713494c20b4828c9620ffb2c4dc9ce1a2 SHA256 670d728c3730ce76be2ff917e023cd3591dea15ff1e8e276ae46fae6178e9b25
 MISC metadata.xml 263 RMD160 97c8ad544063bcbdf65190404934923e0a42d562 SHA1 6e276e4277eeae8ee686d0c858761aa63bf71e0b SHA256 0d5fcdbefefdc4a8d5d703b5a01a74e1bcf181cb3bd29fd82e202221795e51c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqcSHUACgkQu7rWomwgFXq6IwCcDouiirXniCyqYcmJKRYj842D
-/iUAoI6zxqtWKtwYo3kPswDQv+eKgT0x
-=Uoui
------END PGP SIGNATURE-----
diff --git a/app-laptop/hdapsd/files/hdapsd.init b/app-laptop/hdapsd/files/hdapsd.init
index adcd4286564e..ef146ee296a9 100644
--- a/app-laptop/hdapsd/files/hdapsd.init
+++ b/app-laptop/hdapsd/files/hdapsd.init
@@ -12,7 +12,7 @@ checkconfig() {
 	return 1
     fi
 
-    if [[ ! -e /sys/block/${DISK}/queue/protect ]] ; then
+    if [[ ! -e /sys/block/${DISK}/queue/protect ]] && [[ ! -e /sys/block/${DISK}/device/unload_heads ]] ; then
 	eerror "No protect entry for ${DISK}!"
 	eerror "Make sure your kernel is patched with the blk_freeze patch"
 	return 1
diff --git a/app-laptop/hdapsd/hdapsd-20090401.ebuild b/app-laptop/hdapsd/hdapsd-20090401.ebuild
new file mode 100644
index 000000000000..e3dae3983381
--- /dev/null
+++ b/app-laptop/hdapsd/hdapsd-20090401.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20090401.ebuild,v 1.1 2009/10/14 22:03:26 bangert Exp $
+
+EAPI="2"
+
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="IBM ThinkPad Harddrive Active Protection disk head parking daemon"
+HOMEPAGE="http://hdaps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hdaps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+RDEPEND=""
+
+pkg_setup() {
+	# We require the hdaps module which can either come from kernel sources or 
+	# from the tp_smapi package.
+	if ! has_version app-laptop/tp_smapi || ! built_with_use app-laptop/tp_smapi hdaps; then
+		CONFIG_CHECK="~SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} requires app-laptop/tp_smapi (with hdaps USE enabled) or support for CONFIG_SENSORS_HDAPS enabled"
+		linux-info_pkg_setup
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	rm -rf "${D}"/usr/share/doc/hdapsd
+	dodoc ChangeLog README AUTHORS
+	newconfd "${FILESDIR}"/hdapsd.conf hdapsd
+	newinitd "${FILESDIR}"/hdapsd.init hdapsd
+}
+
+pkg_postinst(){
+	[[ -z $(ls "${ROOT}"/sys/block/*/queue/protect 2>/dev/null) ]] && \
+	[[ -z $(ls "${ROOT}"/sys/block/*/device/unload_heads 2>/dev/null) ]] && \
+		ewarn "Your kernel does NOT support shock protection. Kernel 2.6.28 and above is recommended!"
+
+	if ! has_version app-laptop/tp_smapi; then
+		ewarn "Using the hdaps module provided by app-laptop/tp_smapi instead"
+		ewarn "of the in-kernel driver is strongly recommended!"
+	fi
+
+	elog "You can change the default frequency by modifing /sys/devices/platform/hdaps/sampling_rate"
+	elog "You might need to enable shock protection manually by running "
+	elog "   echo -1 > /sys/block/DEVICE/device/unload_heads"
+}