Updating the lm_sensors-2.10.1 ebuild, adding pkg_config, changing the postinst message. Also adding the lm_sensors-detect patch supplied by d[r]eadlock <m.dreadlock at gmail.com> in #157085.

(Portage version: 2.1.2_rc4-r9)

3 files changed, 26 insertions, 14 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 5fb64c36e956..3926ed0614b8 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.59 2007/01/09 21:32:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.60 2007/01/14 20:17:37 phreak Exp $
+
+  14 Jan 2007; Christian Heim <phreak@gentoo.org>
+  files/lm_sensors-2.10.1-sensors-detect-gentoo.patch,
+  lm_sensors-2.10.1.ebuild:
+  Updating the lm_sensors-2.10.1 ebuild, adding pkg_config, changing the
+  postinst message. Also adding the lm_sensors-detect patch supplied by
+  d[r]eadlock <m.dreadlock at gmail.com> in #157085.
 
   09 Jan 2007; Christian Heim <phreak@gentoo.org> lm_sensors-2.9.2.ebuild,
   lm_sensors-2.9.2-r2.ebuild, lm_sensors-2.10.0.ebuild,
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
index d75c36063691..748c56a31cac 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
@@ -84,7 +84,7 @@ Index: lm_sensors-2.10.1/prog/detect/sensors-detect
  #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
  #
  #    This program is free software; you can redistribute it and/or modify
-@@ -5481,13 +5491,22 @@ sub main
+@@ -5481,12 +5491,21 @@ sub main
  # in order as normal variables with the special names:
  #    MODULE_0, MODULE_1, MODULE_2, etc.
  #
@@ -97,18 +97,16 @@ Index: lm_sensors-2.10.1/prog/detect/sensors-detect
  EOT
      print SYSCONFIG
 -      "# Generated by sensors-detect on " . scalar localtime() . "\n";
++      "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
      my @modules = grep /^modprobe /, split "\n", $modprobes;
--    my $i = 0;
-+	  "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
 +    print SYSCONFIG
 +		  "# Load modules at startup\n".
 +		  "LOADMODULES=yes\n\n".
 +		  "# Initialize sensors at startup\n".
 +		  "INITSENSORS=yes\n\n";
-+my $i = 0;
+     my $i = 0;
      my $sysconfig = "";
      foreach (@modules) {
-       s/^modprobe //;
 @@ -5495,10 +5514,8 @@ EOT
        $i++;
      }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
index eb021b99d771..3f0aad436ac7 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild,v 1.2 2007/01/09 21:32:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild,v 1.3 2007/01/14 20:17:37 phreak Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -71,7 +71,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
+	epatch "${FILESDIR}/${P}-sensors-detect-gentoo.patch"
 
 	if use sensord; then
 		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
@@ -105,7 +105,7 @@ src_install() {
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
 		README* TODO
 
-	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
 		doc/progs doc/temperature-sensors doc/vid
 
 	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
@@ -124,10 +124,13 @@ src_install() {
 
 pkg_postinst() {
 	einfo
-	einfo "Next you need to run:"
-	einfo "  /usr/sbin/sensors-detect"
-	einfo "to detect the I2C hardware of your system and create the file:"
-	einfo "  /etc/conf.d/lm_sensors"
+	einfo "Please run \`emerge --config =${P}' in order to setup"
+	einfo "/etc/conf.d/lm_sensors."
+	einfo
+	einfo "/etc/conf.d/lm_sensors is vital to the init-script."
+	einfo "Please make sure you also add lm_sensors to the desired"
+	einfo "runlevel. Otherwise your I2C modules won't get loaded"
+	einfo "on the next startup."
 	einfo
 	einfo "You will also need to run the above command if you're upgrading from"
 	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
@@ -142,4 +145,8 @@ pkg_postinst() {
 	einfo
 }
 
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).
+pkg_config() {
+	ebegin "Executing /usr/sbin/sensors-detect"
+	${ROOT}usr/sbin/sensors-detect
+	eend $?
+}