remove old, fix posix compatibility (bug #474142#c4)

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64

6 files changed, 13 insertions, 146 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index a1acb137dbbd..881fafce01ed 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/hdapsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.24 2013/06/25 12:49:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.25 2013/06/26 14:01:02 ottxor Exp $
+
+  26 Jun 2013;  <junghans@gentoo.org> -files/hdapsd.conf, -files/hdapsd.init,
+  -hdapsd-20090401.ebuild, files/hdapsd.init.3:
+  remove old, fix posix compatibility (bug #474142#c4)
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> hdapsd-20090401-r2.ebuild:
   Stable for amd64, wrt bug #474142
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 4a9ed52d8444..b8e314b93614 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,29 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX hdapsd.conf 321 SHA256 22e1acf385427052a12858db005fd73d42d9f6818fb253b032cd326101df2e34 SHA512 7216dd148c2c235ca49d43c1d06b7b36b906f8231b3a6465f6d33c88ce57719937e79acf3e8159e6e7c94eb303eb584ad384aec68c4349244d48cacda5e9d616 WHIRLPOOL 1171440fcb4acb0b7ae709d29c54224e7206e7d2d9b49aa0d1e55f332d377d0d55a1d6bf40e5dda3dc7f704eb542e255b6bc18af8ed57b67ad065f42e4f0980f
 AUX hdapsd.conf.3 354 SHA256 e17455d2bf6ef75fcada30f7053c991e6f391a11c6a541d42e9b89061a88f139 SHA512 a56f2ea534296d8dac6b2952599121e31dd8623c025dfb0c687b0509c893f04b1a7ae5c890e24d78975b731bb12814e9cdd752704b180aee665be77ab856b46b WHIRLPOOL 5b9447594f14ebc642f60ac1a54de114166072297e7f01c633f03fe25bf6356bfb97d5c759783e92935cd9a26c5550e2da2572eb3fcfde9ef9a05bb8b38b3214
-AUX hdapsd.init 1474 SHA256 cfb13ec173f61da633febb2442b6db6be5ba0433f4b2cff0c370cce916e150d7 SHA512 b06180b1f5008e9de3d444e125d570d001ccf93a3d77c8ac9f8019d18fb91424dfcb8c5f8c2175ed76f9553ce5684de0d08350a06f94bdc24b2bfe4eb7c10438 WHIRLPOOL 60eb20af02991e22bd38eb1bafed6c9480717941b6b5f7153d06827a09d6c91546a4608a48ab7cde5e80880473c15273d6dd30840fdb534b31a55b7fecde3829
-AUX hdapsd.init.3 1872 SHA256 de909d9c8efb585c1d96a0dc5f53b7c459315c761cae860313304137e212bcfe SHA512 7de61fd5d1082606592e46a0617f00fb0d505cadab0d1f5ea5fdf411b484ed4792dd19ccd141fccd843263f481a045ab6445c8fabf0526194b09a7ecf222e1b7 WHIRLPOOL 9b3be8c4e41185d78934a8ec9ad8339a23e7974e70bd0fee6525ebac4adf9aa75839b7df80c9d25874f0dea6fbe3036f7a4ae6b59c99306f9e7ec364f73f4de6
+AUX hdapsd.init.3 1864 SHA256 06ade3d04568969ed6bcb86cc257eeff864d8e3b3fa648bf03c00577ac164205 SHA512 38c78af6d516cf369622483c5a56d758a12c1c241016f227e0e2738e8b1ec20620b40e1aebeb3f053d173d3791c14630a68dc3e25630e057db6ae7b94fcdda32 WHIRLPOOL 8d6fd13b5f96c17b87e3d2663caca7b2c816622ed97f71da6e73af51c8c0b3a7c27e4da813445ade593d8cdc88a9f8996a5c4a7b06cde7b7bed5f82afda0ba01
 DIST hdapsd-20090401.tar.gz 95058 SHA256 32979d58de4c54a7cc5671e7e7b4f0b653b659104faa9610433f8bb5dd4cef7a SHA512 4984a6c636d3447051ca5629fec89f08eee3773750f9623b80d7c0d4af65dcf9868392f2e93f5d13ac329d311ec2ebcdddf3e438007d1f851a920137c6903c96 WHIRLPOOL 9c3822acb39ff1f10e47604725bf6e42546b95ba9db26ebd751b69c4162e3df4f33d177a2a0b7a764c5e0f2478f470595cda304221a0ec165b07ef183b6ea9be
 EBUILD hdapsd-20090401-r2.ebuild 1785 SHA256 3ea00f663df306ad187d07ce34d114b141b7ed4509df2057b37491fd60ae922b SHA512 447e79c5aaed7d6faa2d3f60fc7d80b5781393628fa38f69d8cc4a4967d07aec8ecbc13819985c0ef4526ef83ae1130a216d35a1274ee2b1560f2523af172558 WHIRLPOOL 951f15f9f56b169f1a1637c7f0433942d4afb29dd06bd505c31ada5fe1b78c020f57c614faecc67ae11ecb8814d99ba5d897cb39a7d0beec96a0f63874058d21
-EBUILD hdapsd-20090401.ebuild 1741 SHA256 432285aed9ad35eeb7e703421e3f21204e49a8e137ef32e5d2cb4dcb879c6969 SHA512 e853f23446c624fdd89a6b7ad59e434067a1ebbe779a55ad0f55b9832a3cd1d05b5697c39ecb452f5536473e26d298c455452cff61886dad63cd91e89b8e3177 WHIRLPOOL 0a39a3b68b26db844dd8cf881a541bb1dba0d589686077a9660fd1c4eb745037d5f28a0221f5fd2874a1e1dc3354981ab737e53a2b263462cd2cc07022bf2374
-MISC ChangeLog 3761 SHA256 f9950a650cb49352cbb333fd391c2f045a8c849d714e4cd2380cf27230a86bf0 SHA512 c12316e490fa5f8263688afbded15f169a21a3adb1f6fecbfc6ddbbc63ea5f1baaaacab93c20e2c444f6782a650f96ea5bffbf859d8222f88af4cee9f8f90480 WHIRLPOOL 5c5f53a5bc62ac64c5e6e9cfbf4935d92a8056f20c61b4825c6eb3135bfb4cc2bf47e473b0656f218a3d0c351b43b4f8930f75c6a4ec902acfd251f8f91aea76
+MISC ChangeLog 3946 SHA256 21e7ffacb25b9a1a8f8e629a3a84291378c6261d932ffa297aff743477ef0194 SHA512 27ffb84da55a3cefde619149b99c53eaa3f8d2ac65b5d22745c26143fd83898b4016931d475c099a6fdf76402a9a54944e581105ca70fa9202db1ee837e3e33f WHIRLPOOL 5161bbd7285d975342d73aa58c5a70581d3834c6a7c34ea3a8bdc3f99cdc75ff65abe991eac126b0866ea3054dcbd33d5fd11006fb1a414e4294951c5900bad8
 MISC metadata.xml 415 SHA256 ba1392e5d32ca1999d3a820d9c3885dd55235e20d0181c9620d6d271c7a6a818 SHA512 a0880c36d3dbe949c5d7e926a565b95153a3ea501f548e32f6aa9be3df7752e8d47e256a98063335224fb84833e56961c8ecbe85f0a158cd03f1a6244a1444b7 WHIRLPOOL 2a939a76bc30f6fc6de2a11215cc4b42f465024fce7d44c8690fbf35d125f9b09362745ecfe4dbb4d456e35a771849ee0330d389c0e5dd2c271b96c2fb9c12d6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRyZG6AAoJELp701BxlEWfMDcQALSfwncAlW273zQhQHcZUzng
-OLSDVOSedUYyPVKg9tXmuxEw3lGRyt02XsHnlIScS9v4bX033/J4am2oiDvgCEZm
-IGWlWsM3WsltZ4SWYkyM9Z6a6zTFY8v2C1PIcasLmQeRp7KNz1ZmDhIn7Lr9N2aC
-Yhj1nMIfvloMSpD2iANjb2tK/RSIr6WwiplY+MZZ9xE34r00ND3aypIIy+2QHC4t
-Akn+QO9g2AGmpE4QCYj3AxFeOG/L7rMELO4C6AOypBr98kr7V+fUymWMUCj0iDrd
-hWh8i8jQsDfO9k1F3bUcqcyZrKEyUN7WhBPrBbrpozC9nWrLNuLjNpERIlOBblmW
-kSzdORWDHA1Z433ZyN0+Sm6Cbx6jisthtmiPF7x3/VyKJeR1CtprRrYBXOP/8nPz
-TpJZaOAahOJJKmSgB3DmWgsfxQQfdt4G23u4PT6wBgG6rcKrqnM27Jy1U1BCYdWW
-ntL0Byrzo8e1NX5FyrFpmtR8O825T+rBV4/+4z5qwyeBmYDQagjdnTfIAn59EcvR
-m/ZvEv/ZIKs9KvTP8oIH1cjWOgg10+XDGh2fdZ1tZ2Q+/DXqtb2bVV3Yp6vc1nPV
-kzZUqCl0WjwwWDKxVH9VKquAm6pWX8q2fTF9DjZs77Zz5mXRmtaeE/E9UoWVPSv9
-xh6eEl0baO+P8CBYcEEH
-=Gu8v
------END PGP SIGNATURE-----
diff --git a/app-laptop/hdapsd/files/hdapsd.conf b/app-laptop/hdapsd/files/hdapsd.conf
deleted file mode 100644
index 622190954c74..000000000000
--- a/app-laptop/hdapsd/files/hdapsd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# The name of the disk device that hdapsd should monitor.
-# Usually this is 'hda' or 'sda' the primary master.
-DISK="sda"
-
-# hdapsd sensitivity 
-# The lower the threshold is the earlier 
-# the heads are parked when the laptop is shaked
-THRESHOLD="10"
-
-# Set any extra options here, like -a for Adaptive mode
-OPTIONS="-a"
diff --git a/app-laptop/hdapsd/files/hdapsd.init b/app-laptop/hdapsd/files/hdapsd.init
deleted file mode 100644
index a1b777ea73c2..000000000000
--- a/app-laptop/hdapsd/files/hdapsd.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-depend() {
-    need localmount
-}
-
-checkconfig() {
-    if [[ -z ${DISK} || -z ${THRESHOLD} ]] ; then
-	eerror "You should setup DISK and THRESHOLD in /etc/conf.d/hdapsd."
-	return 1
-    fi
-
-    if [ ! -b /dev/${DISK} ]; then
-	eerror "Could not find disk /dev/${DISK}!"
-	eerror "Adjust the DISK setting in /etc/conf.d/hdapsd"
-	return 1
-    fi
-
-    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
-    fi
-
-    # Load the tp_smapi module first
-    # This is not a requirement, but it helps hdapsd adaptive mode
-    if [[ ! -e /sys/devices/platform/smapi ]] ; then
-	modprobe tp_smapi 2>/dev/null
-    fi
-	
-    if [[ ! -d /sys/devices/platform/hdaps ]]; then
-	ebegin "Loading hdaps module"
-        modprobe hdaps
-	eend $? || return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting Hard Drive Active Protection System daemon"
-    start-stop-daemon --start --exec /usr/sbin/hdapsd \
-	--pidfile /var/run/hdapsd.pid \
-	-- -b -p -d "${DISK}" -s "${THRESHOLD}" ${OPTIONS}
-    eend $?
-}
-	
-stop() {
-    ebegin "Stopping Hard Drive Active Protection System daemon"
-    start-stop-daemon --stop --exec /usr/sbin/hdapsd \
-	--pidfile /var/run/hdapsd.pid
-    eend $?
-}
diff --git a/app-laptop/hdapsd/files/hdapsd.init.3 b/app-laptop/hdapsd/files/hdapsd.init.3
index ef27368f7b5d..d2405232e246 100644
--- a/app-laptop/hdapsd/files/hdapsd.init.3
+++ b/app-laptop/hdapsd/files/hdapsd.init.3
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 depend() {
@@ -7,12 +7,12 @@ depend() {
 }
 
 checkconfig() {
-    if [[ -n ${DISK} ]]; then
+    if [ -n "${DISK}" ]; then
 	ewarn "Please migrate DISK to DISKLIST in /etc/conf.d/hdapsd."
 	DISKLIST=${DISK}
     fi
 
-    if [[ -z ${THRESHOLD} ]] ; then
+    if [ -z "${THRESHOLD}" ] ; then
 	eerror "You should setup THRESHOLD in /etc/conf.d/hdapsd."
 	return 1
     fi
@@ -25,7 +25,7 @@ checkconfig() {
             return 1
         fi
 
-        if [[ ! -e /sys/block/${DISK}/queue/protect ]] && [[ ! -e /sys/block/${DISK}/device/unload_heads ]] ; 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
@@ -34,11 +34,11 @@ checkconfig() {
 
     # Load the tp_smapi module first
     # This is not a requirement, but it helps hdapsd adaptive mode
-    if [[ ! -e /sys/devices/platform/smapi ]] ; then
+    if [ ! -e /sys/devices/platform/smapi ] ; then
 	modprobe tp_smapi 2>/dev/null
     fi
 	
-    if [[ ! -d /sys/devices/platform/hdaps ]]; then
+    if [ ! -d /sys/devices/platform/hdaps ]; then
 	ebegin "Loading hdaps module"
         modprobe hdaps
 	eend $? || return 1
diff --git a/app-laptop/hdapsd/hdapsd-20090401.ebuild b/app-laptop/hdapsd/hdapsd-20090401.ebuild
deleted file mode 100644
index f908544f1ba6..000000000000
--- a/app-laptop/hdapsd/hdapsd-20090401.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 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.5 2011/05/04 15:44:37 tomka 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="amd64 x86"
-IUSE=""
-
-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[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
-	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[hdaps]; 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"
-}