fix sensord USE flag - bug #291326

(Portage version: 2.2_rc53/cvs/Linux i686)

3 files changed, 43 insertions, 5 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 269860aa25b4..efd15a9db4a0 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.95 2009/10/27 08:26:24 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.96 2009/11/29 13:13:08 bangert Exp $
+
+  29 Nov 2009; Thilo Bangert <bangert@gentoo.org> lm_sensors-3.1.1.ebuild,
+  +files/sensord-3-init.d:
+  fix sensord USE flag
 
 *lm_sensors-3.1.1 (27 Oct 2009)
 
diff --git a/sys-apps/lm_sensors/files/sensord-3-init.d b/sys-apps/lm_sensors/files/sensord-3-init.d
new file mode 100644
index 000000000000..74851259729c
--- /dev/null
+++ b/sys-apps/lm_sensors/files/sensord-3-init.d
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/sensord-3-init.d,v 1.1 2009/11/29 13:13:08 bangert Exp $
+
+CONFIG=/etc/sensors3.conf
+
+depend() {
+	need logger
+	use lm_sensors
+}
+
+checkconfig() {
+	if [ ! -f ${CONFIG} ]; then
+		eerror "Configuration file ${CONFIG} not found"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting sensord"
+	start-stop-daemon --start --exec /usr/sbin/sensord \
+		-- --config-file ${CONFIG} ${SENSORD_OPTIONS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping sensord"
+	start-stop-daemon --stop --pidfile /var/run/sensord.pid
+	eend ${?}
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
index cb9be7b392ca..93a8dd0c1cb8 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild,v 1.1 2009/10/27 08:26:24 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild,v 1.2 2009/11/29 13:13:08 bangert Exp $
 
 EAPI="2"
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="sensord"
 
-DEPEND="sys-apps/sed"
+DEPEND="sys-apps/sed
+	sensord? ( net-analyzer/rrdtool )"
 RDEPEND="dev-lang/perl
 		virtual/logger"
 
@@ -28,7 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
 
 	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile || die
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' "${S}"/Makefile || die
 	fi
 
 	# Respect LDFLAGS
@@ -58,7 +59,7 @@ src_install() {
 
 	if use sensord; then
 		newconfd "${FILESDIR}"/sensord-conf.d sensord || die
-		newinitd "${FILESDIR}"/sensord-init.d sensord || die
+		newinitd "${FILESDIR}"/sensord-3-init.d sensord || die
 	fi
 
 	dodoc CHANGES CONTRIBUTORS INSTALL README*