Version bump - bug #67587.

6 files changed, 304 insertions, 21 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 702be094924d..fe31c740bf29 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2004/09/26 22:00:39 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.39 2004/10/24 11:41:46 plasmaroo Exp $
+
+*lm-sensors-2.8.8 (24 Oct 2004)
+
+  24 Oct 2004; <plasmaroo@gentoo.org> +lm-sensors-2.8.8.ebuild,
+  +files/lm-sensors-2.8.8-sensors-detect-gentoo.diff:
+  Version bump - bug #67587.
 
   26 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> lm-sensors-2.8.7.ebuild:
   Marked stable on amd64.
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index af3dfa590c29..e6c44f49d919 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,28 +1,31 @@
-MD5 dfd6a0762dcad5ae5a7098620a74037c ChangeLog 9634
+MD5 44739a68e976441ca6855d42783b3afa ChangeLog 9815
 MD5 9acdfaa4153bc29f15206b6c1ffba965 lm-sensors-2.6.5.ebuild 2134
-MD5 f044a638579ae5d617fc13f754778ed4 lm-sensors-2.7.0-r1.ebuild 2667
-MD5 944709e360fd1141511d20539db124ff lm-sensors-2.8.1.ebuild 3858
-MD5 de20d7de290ddfcf168423a817145963 lm-sensors-2.8.2.ebuild 4725
 MD5 b543de4f31fb0447678bf40de6ae2dde lm-sensors-2.8.3.ebuild 4731
+MD5 14cb570a3a42baa94d63a4fa06e80981 lm-sensors-2.8.8.ebuild 5086
+MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
 MD5 31a6aee03c1e0922704ca64c4e7532f7 lm-sensors-2.8.4.ebuild 4678
-MD5 6e213fd07f8b630698cab84e54047cbf lm-sensors-2.8.5.ebuild 4679
+MD5 de20d7de290ddfcf168423a817145963 lm-sensors-2.8.2.ebuild 4725
 MD5 6a49c8979c26648da1f49457c4350e61 lm-sensors-2.8.6.ebuild 4915
-MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
-MD5 9ec44fe3ba504687c9480b8e3c0e58cd lm-sensors-2.8.7.ebuild 5096
-MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
-MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
+MD5 f044a638579ae5d617fc13f754778ed4 lm-sensors-2.7.0-r1.ebuild 2667
+MD5 6e213fd07f8b630698cab84e54047cbf lm-sensors-2.8.5.ebuild 4679
+MD5 944709e360fd1141511d20539db124ff lm-sensors-2.8.1.ebuild 3858
+MD5 c62de669025e1e0239b83fc5c78cafd9 lm-sensors-2.8.7.ebuild 5112
 MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
+MD5 6b2c48e702de9b0a4e915dcbe1f95e70 files/digest-lm-sensors-2.8.8 68
+MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
+MD5 d15b006ea7a9ea424d03cca949f1053c files/digest-lm-sensors-2.8.6 68
+MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 5006
+MD5 596bd3e0fc473e83d13e6c194e50a3f2 files/lm-sensors-2.8.7-sensors-detect-gentoo.diff 4815
+MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
 MD5 499af1d2975507a304a16c6a1bcba3cd files/digest-lm-sensors-2.8.2 68
 MD5 8fa08bc4e8fe32a411003d7a018c9536 files/digest-lm-sensors-2.8.3 68
-MD5 2008fdc749bfa5f92bc90711e9d0d34d files/digest-lm-sensors-2.8.4 68
-MD5 456d41bfdda2f5df2208f6c4a232a6c4 files/digest-lm-sensors-2.8.5 68
-MD5 d15b006ea7a9ea424d03cca949f1053c files/digest-lm-sensors-2.8.6 68
 MD5 f2c16790be781d921f5da5f1905e0c43 files/lm-sensors-2.8.0-sensors-detect-gentoo.diff 5206
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 5006
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 5006
 MD5 f0520fc5631209ae9278e18d9b464d8e files/no-isadump-ppc.patch 1193
-MD5 e33454a04d8de948781864e289126772 files/rc 2180
-MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
+MD5 2008fdc749bfa5f92bc90711e9d0d34d files/digest-lm-sensors-2.8.4 68
 MD5 311fc2ac49c876ff12c485cb2a53d9ac files/digest-lm-sensors-2.8.7 68
+MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 5006
+MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
 MD5 4c60dc8246e548fab5b56c66f6d6a020 files/lm-sensors-2.6.5-hk-longstring.patch 1475
-MD5 596bd3e0fc473e83d13e6c194e50a3f2 files/lm-sensors-2.8.7-sensors-detect-gentoo.diff 4815
+MD5 456d41bfdda2f5df2208f6c4a232a6c4 files/digest-lm-sensors-2.8.5 68
+MD5 e33454a04d8de948781864e289126772 files/rc 2180
+MD5 62d5eaa6c0f7bec20849a635b32616b6 files/lm-sensors-2.8.8-sensors-detect-gentoo.diff 4843
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.8 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.8
new file mode 100644
index 000000000000..5f9606d03928
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.8
@@ -0,0 +1 @@
+MD5 95cdb083b4d16e2419a2c78b35f608d0 lm_sensors-2.8.8.tar.gz 820983
diff --git a/sys-apps/lm-sensors/files/lm-sensors-2.8.8-sensors-detect-gentoo.diff b/sys-apps/lm-sensors/files/lm-sensors-2.8.8-sensors-detect-gentoo.diff
new file mode 100644
index 000000000000..a35525fa3107
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-2.8.8-sensors-detect-gentoo.diff
@@ -0,0 +1,119 @@
+--- lm_sensors-2.8.8/prog/detect/sensors-detect	2004-10-03 21:51:47.000000000 +0100
++++ lm_sensors-2.8.8/prog/detect/sensors-detect.plasmaroo	2004-10-24 12:33:39.837299960 +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;
+@@ -4882,39 +4890,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(local *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
+@@ -4935,13 +4948,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
+@@ -4956,9 +4973,7 @@
+         $i++;
+       }
+       print SYSCONFIG $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.7.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
index 6532792d2511..6bbf97d67e33 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.7.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.7.ebuild,v 1.5 2004/09/26 22:00:39 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild,v 1.6 2004/10/24 11:41:46 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,11 +15,11 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 SLOT="${KV}"
 
 KEYWORDS="-ppc -sparc x86 amd64"
-IUSE=""
+IUSE="rrdtool"
 LICENSE="GPL-2"
 
 DEPEND=">=sys-apps/i2c-${PV}
-	rrdtool? ( net-analyzer/rrdtool )"
+	rrdtool? ( x86? ( net-analyzer/rrdtool ) )"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild
new file mode 100644
index 000000000000..1e32f609feef
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild
@@ -0,0 +1,154 @@
+# 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.8.ebuild,v 1.1 2004/10/24 11:41:46 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="~x86"
+IUSE="rrdtool"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/i2c-${PV}
+	rrdtool? ( net-analyzer/rrdtool )"
+
+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/
+
+	# Add sensord to the make targets if the rrdtool USE flag is on...
+	use rrdtool && sed -i -e 's:# PROG_EXTRA:PROG_EXTRA:' Makefile
+}
+
+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.8."
+	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
+}