Version bump and metadata update.

6 files changed, 270 insertions, 3 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 84b841dbf552..3884f4cdabe3 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/lm-sensors
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.10 2003/11/27 19:11:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.11 2003/12/13 23:22:27 plasmaroo Exp $
+
+*lm-sensors-2.8.2 (13 Dec 2003)
+
+  13 Dec 2003; <plasmaroo@gentoo.org> lm-sensors-2.8.2.ebuild:
+  Version bump; this closes bug #35709. This version supports 2.6 kernels.
 
 *lm-sensors-2.8.1 (27 Nov 2003)
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 28997808f0cb..ab57c3edb6a2 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,9 +1,9 @@
-MD5 bd10fb9eb7cacb023325c8224eced236 ChangeLog 4869
+MD5 ba77a3417bf248f760a8360e3827a56b ChangeLog 4871
 MD5 efdd071257ee7e4314b70e1903efab32 lm-sensors-2.6.5.ebuild 2036
 MD5 07940dcd0942c7b3b6b238fb09eede72 lm-sensors-2.8.0.ebuild 3919
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
 MD5 655b7e9df1b01c8a7f9cdb30d5daa475 lm-sensors-2.7.0.ebuild 2321
-MD5 e08e0b33a606a6c6fc7fb047b1f06bee lm-sensors-2.8.2.ebuild 4671
+MD5 9bc2df274f9f9a9df93a855d0f602e7b lm-sensors-2.8.2.ebuild 4659
 MD5 4114af2a24bbb2cce7e2b199279f45d7 lm-sensors-2.7.0-r1.ebuild 2666
 MD5 f0ffc9035755aae9c0ac6ceb3e85de80 lm-sensors-2.8.1.ebuild 3919
 MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2
new file mode 100644
index 000000000000..39cab2da9d02
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2
@@ -0,0 +1 @@
+MD5 e38406adca7db7e1e761269e4de8b248 lm_sensors-2.8.2.tar.gz 717184
diff --git a/sys-apps/lm-sensors/files/lm-sensors-2.8.2-sensors-detect-gentoo.diff b/sys-apps/lm-sensors/files/lm-sensors-2.8.2-sensors-detect-gentoo.diff
new file mode 100644
index 000000000000..916222d7637f
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-2.8.2-sensors-detect-gentoo.diff
@@ -0,0 +1,123 @@
+--- prog/detect/sensors-detect.orig	2003-11-27 19:39:22.000000000 +0100
++++ prog/detect/sensors-detect	2003-11-27 19:40:21.000000000 +0100
+@@ -25,6 +25,14 @@
+ # each be put in a separate file, using modules and packages. That is beyond
+ # me.
+ 
++# Changelog
++#  02/Mar/2003, Rudo Thomas <thomr9am@ss1000.ms.mff.cuni.cz>
++#    * a few small changes in config file output to reflect Gentoo Linux layout
++#      - /etc/sysconfig -> /etc/conf.d
++#      - /etc/rc.d/init.d -> /etc/init.d
++#      - added a warning to the generated config file
++#      - small change when asking about writing the new config file
++
+ require 5.004;
+ 
+ use strict;
+@@ -4072,38 +4080,48 @@
+   my $use_isa = not <STDIN> =~ /\s*[Ss]/;
+      
+   my ($modprobes,$configfile) = generate_modprobes $use_isa;
+-  print "\nTo make the sensors modules behave correctly, add these lines to\n",
+-        "$modules_conf:\n\n";
++
++
++  print "\nIf you want to load the modules at startup, generate a config",
++       " file\n",
++       "below and make sure lm_sensors get started ",
++       "(eg. rc-update add lm_sensors default).\n";
++  print "\nTo make the sensor modules behave correctly, add these lines to\n",
++        "/etc/modules.conf:\n\n";
+   print "#----cut here----\n";
+   print $configfile;
+-  print "#----cut here----\n";
+-  print "\nTo load everything that is needed, add this to some /etc/rc* ",
+-        "file:\n\n";
+-  print "#----cut here----\n";
+-  print $modprobes;
+-  print "# sleep 2 # optional\n",
+-        "/usr/local/bin/sensors -s # recommended\n";
+-  print "#----cut here----\n";
++  print "#----end cut here----\n";
++
+   print "\nWARNING! If you have some things built into your kernel, the list above\n",
+         "will contain too many modules. Skip the appropriate ones! You really should\n",
+         "try these commands right now to make sure everything is working properly.\n",
+         "Monitoring programs won't work until it's done.\n";
+-  
+-  my $have_sysconfig = -d '/etc/sysconfig';
+-  print "\nDo you want to generate /etc/sysconfig/lm_sensors? (".
+-    ($have_sysconfig?"YES/no":"yes/NO")."): ";
+-  if ($> != 0) {
+-    print "\nAs you are not root, we shall skip this step.\n";
+-  } else {
+-    if (($have_sysconfig and not <STDIN> =~ /^\s*[Nn]/) or <STDIN> =~ /^\s*[Yy]/) {
+-      unless ($have_sysconfig) {
+-        mkdir '/etc/sysconfig', 0777
+-          or die "Sorry, can't create /etc/sysconfig ($!)?!?";
+-      }
+-      open(SYSCONFIG, ">/etc/sysconfig/lm_sensors")
+-        or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)?!?";
+-      print SYSCONFIG <<'EOT';
+-#    /etc/sysconfig/sensors - Defines modules loaded by /etc/rc.d/init.d/lm_sensors
++  print "To load everything that is needed, execute the commands above...";
++
++  print "\n\n#----cut here----\n";
++  print $modprobes;
++  print "# sleep 2 # optional\n",
++        "/usr/local/bin/sensors -s # recommended\n";
++  print "#----end cut here----\n";
++
++  my $have_config = -f '/etc/conf.d/lm_sensors';
++  print "\nDo you want to ".($have_config?"overwrite":"generate").
++       " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
++       "  (".($have_config?"yes/NO":"YES/no")."/s): ";
++  my $reply = <STDIN>;
++
++  if (($have_config and $reply =~ /^\s*[Yy]/) or
++      (not $have_config and not $reply =~ /^\s*[Nn]/) or
++      $reply =~ /^\s*[Ss]/) {
++    my $filename = "/etc/conf.d/lm_sensors";
++    if ($reply =~ /^\s*[Ss]/) {
++      print "Specify the file to store the configuration to: ";
++      $filename = <STDIN>;
++    }
++    open(SYSCONFIG, ">".$filename)
++       or die "Sorry, can't create $filename ($!).";
++       print SYSCONFIG <<'EOT';
++#    /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
+ #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
+ #
+ #    This program is free software; you can redistribute it and/or modify
+@@ -4124,13 +4142,17 @@
+ # See also the lm_sensors homepage at:
+ #     http://www2.lm-sensors.nu/~lm78/index.html
+ #
+-# This file is used by /etc/rc.d/init.d/lm_sensors and defines the modules to
+-# be loaded/unloaded. This file is sourced into /etc/rc.d/init.d/lm_sensors.
++# This file is used by /etc/init.d/lm_sensors and defines the modules to
++# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
+ #
+ # The format of this file is a shell script that simply defines the modules
+ # in order as normal variables with the special names:
+ #    MODULE_0, MODULE_1, MODULE_2, etc.
+ #
++# Please note that the numbers in MODULE_X must start at 0 and increase in
++# steps of 1. Any number that is missing will make the init script skip the
++# rest of the modules.
++#
+ # List the modules that are to be loaded for your system
+ #
+ EOT
+@@ -4146,9 +4168,7 @@
+       }
+       print SYSCONFIG $sysconfig;
+       close(SYSCONFIG);
+-      print "Copy prog/init/lm_sensors.init to /etc/rc.d/init.d/lm_sensors\n";
+-      print "for initialization at boot time.\n";
+-    }
++      print "Done.\n";
+   }
+ }
+ 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
new file mode 100644
index 000000000000..7d43c749dd13
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild,v 1.1 2003/12/13 23:22:27 plasmaroo Exp $
+
+inherit flag-o-matic
+
+MY_P=${PN/-/_}-${PV}
+S="${WORKDIR}/${MY_P}"
+MYI2C="${WORKDIR}/i2c-headers"
+
+DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
+SRC_URI="http://www.lm-sensors.nu/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
+
+SLOT="${KV}"
+# gentoo-sources-2.4.20-r1 and xfs-sources-2.4.20-r1 will
+# have support for this package, do not change these to ~
+# until your arch has i2c-2.7.0 in it's kernel.
+KEYWORDS="~x86 ~amd64 -ppc -sparc"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/i2c-2.8.0"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/${P}-sensors-detect-gentoo.diff > /dev/null || die
+
+	# Get the right I2C includes without dropping the kernel includes
+	mkdir -p ${MYI2C}/linux
+	cp /usr/include/linux/i2c* ${MYI2C}/linux/
+}
+
+src_compile()  {
+	echo
+	einfo "*****************************************************************"
+	einfo
+	einfo "This ebuild assumes your /usr/src/linux kernel is the one you"
+	einfo "used to build i2c-2.8.2."
+	einfo
+	einfo "For 2.5+ series kernels, use the support already in the kernel"
+	einfo "under 'Character devices' -> 'I2C support' and then merge this"
+	einfo "ebuild."
+	einfo
+	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
+	einfo "or symlink /usr/src/linux to another kernel."
+	einfo
+	einfo "*****************************************************************"
+	echo
+
+	UserModeOnly=false
+	if [ "$LINUX" != "" ]; then
+		einfo "Cross-compiling using:- $LINUX"
+		LINUX=`echo $LINUX | sed 's/build\//build/'`
+		KV=`cut -d\  -f3 ${LINUX}include/linux/version.h | grep \" | sed -e 's/"//' -e 's/"//'`
+		if [ "${KV}" == "" ]; then
+			die "Could not get kernel version; make sure ${LINUX}include/linux/version.h is there!"
+		fi
+	else
+		LINUX='/usr/src/linux'
+		check_KV || die "Cannot find kernel in /usr/src/linux!"
+		einfo "Using kernel in /usr/src/linux/:- ${KV}"
+	fi
+	if [ `echo ${KV} | grep 2\.[56]\.` ]; then
+		einfo "You are using a 2.5 / 2.6 series kernel; only building utilities..."
+		UserModeOnly=true
+	else
+		einfo "You are using a `echo ${KV} | cut -d. -f-2` series kernel; building everything..."
+	fi
+	if [ "${KV}" != "${SLOT}" ]; then
+		echo
+		ewarn "WARNING:- Specified and running kernels do not match!"
+		ewarn "WARNING:- This package will be slotted as ${SLOT}!"
+	fi
+
+	echo; einfo "You may safely ignore any errors from compilation"
+	einfo "that contain 'No such file' references."
+
+	echo
+	filter-flags -fPIC
+
+	cd ${S}
+	emake clean
+	if [ ${UserModeOnly} == true ]; then
+		emake I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
+	else
+		emake I2C_HEADERS=${MYI2C} LINUX=$LINUX || die "lm_sensors requires the source of a compatible kernel version in /usr/src/linux or specified in \$LINUX and >=i2c-2.8.0 support built as modules. This support is included in gentoo-sources as of 2.4.20-r1"
+	fi
+}
+
+src_install() {
+
+	mkdir -p ${D}/usr/bin
+	mkdir -p ${D}/usr/sbin
+	if [ ${UserModeOnly} == true ]; then
+		emake PREFIX=${D}/usr MANDIR=${D}/usr/share/man user_install || die "Install failed!"
+	else
+		emake LINUX=$LINUX DESTDIR=${D} PREFIX=${D}/usr MANDIR=${D}/usr/share/man install || die "Install failed!"
+		mv ${D}/${D}* ${D}
+		rm ${D}/var -Rf
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rc lm_sensors
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
+		README* TODO
+	cp -a doc/* ${D}/usr/share/doc/${PF}
+
+}
+
+pkg_postinst() {
+	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+
+	echo
+	einfo
+	einfo "The lm_sensors hardware sensors package has been installed."
+	einfo
+	einfo "It is recommended that you read the lm_sensors documentation."
+	einfo "To enable lm_sensors you will need to compile i2c support in"
+	einfo "your kernel as a module and run /usr/sbin/sensors-detect to"
+	einfo "detect the hardware in your system."
+	einfo
+	einfo "Be warned, the probing of hardware in your system performed by"
+	einfo "sensors-detect could freeze your system.  Also do not use"
+	einfo "lm_sensors on certain laptop models from IBM.  See the lm_sensors"
+	einfo "documentation and website for more information."
+	einfo
+	einfo "IMPORTANT: When you merge this package it installs kernel modules"
+	einfo "that can only be used with the specific kernel version whose"
+	einfo "source is located in /usr/src/linux.  If you upgrade to a new"
+	einfo "kernel, you will need to remerge the lm_sensors package to build"
+	einfo "new kernel modules."
+	einfo
+	echo
+}
diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 96a2d586367d..c5ca5e3cef2e 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<maintainer>
+	<email>plasmaroo@gentoo.org</email>
+</maintainer>
 </pkgmetadata>