Marking 2.8 series "~x86"; added 2.8.7 - closes bug #54606.

9 files changed, 289 insertions, 11 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 53f9c23aa491..0039dbfe0619 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/lm-sensors
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.30 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.31 2004/07/12 15:07:34 plasmaroo Exp $
+
+*lm-sensors-2.8.7 (12 Jul 2004)
+
+  12 Jul 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.2.ebuild,
+  lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild,
+  lm-sensors-2.8.6.ebuild, +lm-sensors-2.8.7.ebuild,
+  +files/lm-sensors-2.8.7-sensors-detect-gentoo.diff:
+  Marking 2.8 series "~x86"; added 2.8.7 - closes bug #54606.
 
   30 Jun 2004; Aron Griffis <agriffis@gentoo.org> lm-sensors-2.6.5.ebuild,
   lm-sensors-2.7.0-r1.ebuild, lm-sensors-2.8.1.ebuild,
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.7 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.7
new file mode 100644
index 000000000000..c2d377771b6f
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.7
@@ -0,0 +1 @@
+MD5 64b4a4f547b2e1eab8a574d871867ca5 lm_sensors-2.8.7.tar.gz 791187
diff --git a/sys-apps/lm-sensors/files/lm-sensors-2.8.7-sensors-detect-gentoo.diff b/sys-apps/lm-sensors/files/lm-sensors-2.8.7-sensors-detect-gentoo.diff
new file mode 100644
index 000000000000..45e1ff3c5d58
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-2.8.7-sensors-detect-gentoo.diff
@@ -0,0 +1,119 @@
+--- prog/detect/sensors-detect	2004-06-11 19:47:13.000000000 +0100
++++ prog/detect/sensors-detect-2.8.7	2004-07-12 15:44:13.715998584 +0100
+@@ -26,6 +26,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;
+@@ -4803,39 +4811,44 @@
+   my $use_isa = not <STDIN> =~ /\s*[Ss]/;
+      
+   my ($modprobes,$configfile) = generate_modprobes $use_isa;
++  print "\nIf you want to load the modules at startup, generate a config file\n",
++	"below and make sure lm_sensors gets started; e.g\n",
++	"\$ rc-update add lm_sensors default.\n";
+   print "\nTo make the sensors modules behave correctly, add these lines to\n",
+-        "$modules_conf:\n\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 {
+-    $_ = <STDIN>;
+-    if (($have_sysconfig and not m/^\s*[Nn]/) or m/^\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/bin/sensors -s # recommended\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
+@@ -4856,13 +4869,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. Use MODULE_X_ARGS for arguments.
++#
+ # List the modules that are to be loaded for your system
+ #
+ EOT
+@@ -4878,9 +4895,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
index 04c9d898548c..8a602eef0867 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.2.ebuild,v 1.13 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild,v 1.14 2004/07/12 15:07:34 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
 
-KEYWORDS="~amd64 -ppc -sparc -x86"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
index a1770119e8c3..e9592ec8da31 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.3.ebuild,v 1.6 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild,v 1.7 2004/07/12 15:07:34 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
 
-KEYWORDS="~amd64 -ppc -sparc -x86"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
index 82b8509dfe66..2c738f6da0bf 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.4.ebuild,v 1.6 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild,v 1.7 2004/07/12 15:07:34 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
 
-KEYWORDS="~amd64 -ppc -sparc -x86"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild
index 9ce69a62a499..680a5b287337 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.5.ebuild,v 1.6 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild,v 1.7 2004/07/12 15:07:34 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
 
-KEYWORDS="~amd64 -ppc -sparc -x86"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
index 236d37d58fcb..7dd0bfbe0365 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.6.ebuild,v 1.6 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild,v 1.7 2004/07/12 15:07:34 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
 
-KEYWORDS="amd64 -ppc -sparc -x86"
+KEYWORDS="amd64 -ppc -sparc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
new file mode 100644
index 000000000000..13a97ac7638e
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2004 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.8.7.ebuild,v 1.1 2004/07/12 15:07:34 plasmaroo Exp $
+
+inherit flag-o-matic eutils
+
+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}"
+
+KEYWORDS="-ppc -sparc ~x86"
+IUSE=""
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/i2c-${PV}"
+
+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.7."
+	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
+
+	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
+		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
+	fi
+
+	echo; einfo "You may safely ignore any errors from compilation"
+	einfo "that contain 'No such file' references."
+
+	echo
+
+	# Please _don't_ use filter-flags -fPIC on apps that need it!
+	# [ amd64, hppa, ia64, etc... ]
+	# Danny van Dyk <kugelfang@gentoo.org> 2004/05/28
+	case "${ARCH}" in
+		"amd64")
+			filter-flags -fstack-protector
+			;;
+		*)
+			filter-flags -fPIC -fstack-protector
+			;;
+	esac
+
+	cd ${S}
+	emake clean
+
+	if [ ${UserModeOnly} == true ]; then
+		emake CC=${CC} I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
+	else
+		emake CC=${CC} 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.1 support built as modules. Make sure that I2C >=2.8.1 is on your system before filing a bug."
+	fi
+}
+
+src_install() {
+
+	mkdir -p ${D}/usr/bin
+	mkdir -p ${D}/usr/sbin
+	if [ ${UserModeOnly} == true ]; then
+		emake DESTDIR=${D} 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!"
+	fi
+	cp ${D}/${D}* ${D} -Rf
+	rm ${D}/var -Rf
+
+	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
+}