Add myself as co-maintainer and version bump.

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!)

5 files changed, 197 insertions, 10 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index 4a339b069c4e..7e6761a92099 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2013/06/26 14:09:22 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.29 2014/10/29 02:12:52 mjo Exp $
+
+*hdapsd-20141024 (29 Oct 2014)
+
+  29 Oct 2014; Michael Orlitzky <mjo@gentoo.org> +files/hdapsd.conf-20141024,
+  +files/hdapsd.init-20141024, +hdapsd-20141024.ebuild, metadata.xml:
+  Add myself as co-maintainer and version bump.
 
   26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> -files/hdapsd.conf,
   -files/hdapsd.init, -hdapsd-20090401.ebuild, files/hdapsd.init.3:
diff --git a/app-laptop/hdapsd/files/hdapsd.conf-20141024 b/app-laptop/hdapsd/files/hdapsd.conf-20141024
new file mode 100644
index 000000000000..a83d8bb181ac
--- /dev/null
+++ b/app-laptop/hdapsd/files/hdapsd.conf-20141024
@@ -0,0 +1,24 @@
+# Configuration for the HDAPS daemon (hdapsd). All settings here are
+# optional and will override those set in /etc/hdapsd.conf (if hdapsd
+# was built with libconfig support).
+
+# The list of the disk devices that hdapsd should monitor. Usually
+# this is "hda", "sda", or "hda sda". The hdaps daemon will attempt to
+# auto-detect your drive if this is left empty. Empty by default.
+#
+#DISKLIST="sda"
+
+# Hdapsd sensitivity. The lower the threshold, the earlier the heads
+# are parked when movement is detected. The default is determined by
+# hdapsd, and is currently 15.
+#
+#THRESHOLD="10"
+
+# Log to syslog? Disabled by default.
+#
+#SYSLOG="true"
+
+# Set any extra options here, like -a for "adaptive mode". Empty by
+# default.
+#
+#OPTIONS="-a"
diff --git a/app-laptop/hdapsd/files/hdapsd.init-20141024 b/app-laptop/hdapsd/files/hdapsd.init-20141024
new file mode 100644
index 000000000000..b4d0eab26b5c
--- /dev/null
+++ b/app-laptop/hdapsd/files/hdapsd.init-20141024
@@ -0,0 +1,76 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+
+description="Hard Drive Active Protection System daemon"
+command="/usr/sbin/hdapsd"
+pidfile="/run/hdapsd.pid"
+
+# Always daemonize when started by OpenRC, and don't make the pidfile
+# configurable. Even if the user sets something dumb for the pidfile
+# in /etc/hdapsd.conf, we want it to work! Fortunately the settings
+# passed on the command-line override the config file.
+command_args="--background --pidfile=${pidfile}"
+
+
+depend() {
+    need localmount
+}
+
+checkconfig() {
+    # An empty DISKLIST is allowed because the disk will be
+    # auto-detected.
+    for DISK in ${DISKLIST}; do
+        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
+    done
+
+    # Load the tp_smapi module first. This is not a requirement, but
+    # it helps hdapsd's 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
+
+    for DISK in ${DISKLIST}; do
+	command_args="${command_args} -d ${DISK}"
+    done
+
+    # Since all of these settings are now optional, we append them
+    # only if we need to.
+    if [ ! -z "${THRESHOLD}" ] ; then
+	command_args="${command_args} --sensitivity ${THRESHOLD}"
+    fi
+
+    if [ ! -z "${SYSLOG}" ] ; then
+	command_args="${command_args} --syslog"
+    fi
+
+    if [ ! -z "${OPTIONS}" ] ; then
+	command_args="${command_args} ${OPTIONS}"
+    fi
+
+    ebegin "Starting the ${description}"
+    start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" \
+	-- ${command_args}
+    eend $?
+}
diff --git a/app-laptop/hdapsd/hdapsd-20141024.ebuild b/app-laptop/hdapsd/hdapsd-20141024.ebuild
new file mode 100644
index 000000000000..ab9bbc838317
--- /dev/null
+++ b/app-laptop/hdapsd/hdapsd-20141024.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20141024.ebuild,v 1.1 2014/10/29 02:12:52 mjo Exp $
+
+EAPI=5
+inherit linux-info readme.gentoo systemd
+
+DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
+HOMEPAGE="https://github.com/evgeni/${PN}/"
+SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libconfig"
+
+DEPEND="libconfig? ( dev-libs/libconfig )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# We require the hdaps module which can either come from either the
+	# kernel itself (CONFIG_SENSORS_HDAPS) 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[hdaps] or "
+		ERROR_SENSORS_HDAPS+="kernel support for CONFIG_SENSORS_HDAPS enabled"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure(){
+	econf \
+		$(use_enable libconfig) \
+		--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+		--docdir="${EROOT}usr/share/doc/${PF}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}/hdapsd.conf-${PV}" hdapsd
+	newinitd "${FILESDIR}/hdapsd.init-${PV}" hdapsd
+	readme.gentoo_create_doc
+}
+
+pkg_postinst(){
+	[[ -z $(ls "${EROOT}"sys/block/*/queue/protect 2>/dev/null) ]] && \
+	[[ -z $(ls "${EROOT}"sys/block/*/device/unload_heads 2>/dev/null) ]] && \
+		ewarn "Your kernel does NOT support shock protection."
+
+	readme.gentoo_print_elog
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+${PN} requires a kernel module to function properly. The recommended
+approach is to install app-laptop/tp_smapi[hdaps], but the in-tree
+module provided by CONFIG_SENSORS_HDAPS may work as well.
+
+Common daemon parameters can be set in ${EROOT}etc/conf.d/${PN}. If the
+package was installed with USE=libconfig, then the parameters can also
+be set in ${EROOT}etc/${PN}.conf, although the former will take
+precedence over the latter if both are used.
+
+You can change the default sampling rate by modifing
+
+  /sys/devices/platform/hdaps/sampling_rate
+
+and you may need to enable shock protection manually by running
+
+  # echo -1 > /sys/block/<disk>/device/unload_heads
+
+as root.
+"
diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
index fe60e106f9c3..2eea4ca078b5 100644
--- a/app-laptop/hdapsd/metadata.xml
+++ b/app-laptop/hdapsd/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<longdescription>IBM ThinkPad Harddrive Active Protection disk head parking	daemon</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">hdapsd</remote-id>
-	</upstream>
+  <maintainer>
+    <email>ottxor@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+
+  <use>
+    <flag name='libconfig'>
+      Require <pkg>dev-libs/libconfig</pkg> to allow the daemon to
+      read a configuration file at startup
+    </flag>
+  </use>
 </pkgmetadata>