Version bump. Bug #76164.

5 files changed, 249 insertions, 87 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 1789d0989e3d..a868b4017783 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.43 2004/12/17 20:26:46 hansmi Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.44 2005/01/01 22:17:07 plasmaroo Exp $
+
+*lm-sensors-2.9.0 (01 Jan 2005)
+
+  01 Jan 2005; <plasmaroo@gentoo.org> +lm-sensors-2.9.0.ebuild, files/rc:
+  Version bump. Bug #76164.
 
   17 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
   lm-sensors-2.6.5.ebuild:
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 671a09226783..ed070cf7d323 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,31 +1,33 @@
-MD5 80e3e244a0ac5bc05760eaff2011a71d lm-sensors-2.8.8.ebuild 5071
+MD5 6f0ef517d0b6fe2c04544f684f121337 ChangeLog 10969
 MD5 68f688d42279ce38dd010f3096a131a6 lm-sensors-2.6.5.ebuild 2132
-MD5 f044a638579ae5d617fc13f754778ed4 lm-sensors-2.7.0-r1.ebuild 2667
+MD5 110f9591ec2f34d13bbb37b2db04ecaa lm-sensors-2.9.0.ebuild 5078
+MD5 446ec6348eed77be70201de269f0336e lm-sensors-2.8.3.ebuild 4717
+MD5 80e3e244a0ac5bc05760eaff2011a71d lm-sensors-2.8.8.ebuild 5071
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
-MD5 61de29e20254639b7d2237a67e71ccf4 lm-sensors-2.8.5.ebuild 4665
-MD5 07a8c732ec21c4161c3906ce6a01fc07 lm-sensors-2.8.7.ebuild 5097
+MD5 111bb3b2ba0aedf7f7ac46ca52d6ba64 lm-sensors-2.8.4.ebuild 4664
+MD5 e1b432e70deac92491ae27d52cf6a8b4 lm-sensors-2.8.2.ebuild 4710
 MD5 54be4ca71109ba1d35f0ed7bafd697ae lm-sensors-2.8.6.ebuild 4901
-MD5 839fcf3255864846edf115299caa9570 ChangeLog 10830
+MD5 f044a638579ae5d617fc13f754778ed4 lm-sensors-2.7.0-r1.ebuild 2667
+MD5 61de29e20254639b7d2237a67e71ccf4 lm-sensors-2.8.5.ebuild 4665
 MD5 f7b7d6461a8d43e2cbe6769b95f0f4cd lm-sensors-2.8.1.ebuild 3839
-MD5 e1b432e70deac92491ae27d52cf6a8b4 lm-sensors-2.8.2.ebuild 4710
-MD5 111bb3b2ba0aedf7f7ac46ca52d6ba64 lm-sensors-2.8.4.ebuild 4664
-MD5 446ec6348eed77be70201de269f0336e lm-sensors-2.8.3.ebuild 4717
-MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
+MD5 07a8c732ec21c4161c3906ce6a01fc07 lm-sensors-2.8.7.ebuild 5097
+MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
 MD5 6b2c48e702de9b0a4e915dcbe1f95e70 files/digest-lm-sensors-2.8.8 68
-MD5 d15b006ea7a9ea424d03cca949f1053c files/digest-lm-sensors-2.8.6 68
-MD5 456d41bfdda2f5df2208f6c4a232a6c4 files/digest-lm-sensors-2.8.5 68
-MD5 8fa08bc4e8fe32a411003d7a018c9536 files/digest-lm-sensors-2.8.3 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 e33454a04d8de948781864e289126772 files/rc 2180
-MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 5006
-MD5 4c60dc8246e548fab5b56c66f6d6a020 files/lm-sensors-2.6.5-hk-longstring.patch 1475
+MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
 MD5 499af1d2975507a304a16c6a1bcba3cd files/digest-lm-sensors-2.8.2 68
-MD5 2008fdc749bfa5f92bc90711e9d0d34d files/digest-lm-sensors-2.8.4 68
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 5006
-MD5 62d5eaa6c0f7bec20849a635b32616b6 files/lm-sensors-2.8.8-sensors-detect-gentoo.diff 4843
-MD5 311fc2ac49c876ff12c485cb2a53d9ac files/digest-lm-sensors-2.8.7 68
-MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
+MD5 8fa08bc4e8fe32a411003d7a018c9536 files/digest-lm-sensors-2.8.3 68
 MD5 f2c16790be781d921f5da5f1905e0c43 files/lm-sensors-2.8.0-sensors-detect-gentoo.diff 5206
 MD5 f0520fc5631209ae9278e18d9b464d8e files/no-isadump-ppc.patch 1193
+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 7f118aec7c81c482c292c7d228c80119 files/digest-lm-sensors-2.9.0 68
+MD5 456d41bfdda2f5df2208f6c4a232a6c4 files/digest-lm-sensors-2.8.5 68
+MD5 a736e93764715cdba52f4aa0c4f20228 files/rc 2336
+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.9.0 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.9.0
new file mode 100644
index 000000000000..010152f9cdc3
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.9.0
@@ -0,0 +1 @@
+MD5 add1f403c619e84bec2fbdfa12eda56f lm_sensors-2.9.0.tar.gz 823545
diff --git a/sys-apps/lm-sensors/files/rc b/sys-apps/lm-sensors/files/rc
index 095b79fb10be..f2c22ef1813f 100644
--- a/sys-apps/lm-sensors/files/rc
+++ b/sys-apps/lm-sensors/files/rc
@@ -8,49 +8,51 @@ start() {
 
 	. /etc/conf.d/lm_sensors
 
-	if [ -z "${MODULE_0}" ] ; then
-		eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
-		return 1
-	fi
-
-	einfo "Loading lm_sensors modules..."
+	if [ "$LOADMODULES" == "yes" ] ; then
+		if [ -z "${MODULE_0}" ] ; then
+			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
+			return 1
+		fi
 
-	mount | grep sysfs &>/dev/null
-	if [ $? == 0 ]; then
-		if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
-			ebegin "  Loading i2c-core"
-			modprobe i2c-core &>/dev/null
+		einfo "Loading lm_sensors modules..."
+	
+		mount | grep sysfs &>/dev/null
+		if [ $? == 0 ]; then
+			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
+				ebegin "  Loading i2c-core"
+				modprobe i2c-core &>/dev/null
+				if [ $? != 0 ]; then
+					eerror "    Could not load i2c-core!"
+					eend 1
+				fi
+				( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
+				eend 0
+			fi
+		elif ! [ -e /proc/sys/dev/sensors ]; then
+			ebegin "  Loading i2c-proc"
+			modprobe i2c-proc &>/dev/null
 			if [ $? != 0 ]; then
-				eerror "    Could not load i2c-core!"
+				eerror "    Could not load i2c-proc!"
 				eend 1
 			fi
-			( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
+			[ -e /proc/sys/dev/sensors ] || return 1
 			eend 0
 		fi
-	elif ! [ -e /proc/sys/dev/sensors ]; then
-		ebegin "  Loading i2c-proc"
-		modprobe i2c-proc &>/dev/null
-		if [ $? != 0 ]; then
-			eerror "    Could not load i2c-proc!"
-			eend 1
-		fi
-		[ -e /proc/sys/dev/sensors ] || return 1
-		eend 0
-	fi
-
-	i=0
-	while true; do
-		module=`eval echo '$'MODULE_${i}`
-		module_args=`eval echo '$'MODULE_${i}_ARGS`
-		if [ -z "${module}" ] ; then
-			break
-		fi
-		ebegin "  Loading ${module}"
-		modprobe ${module} ${module_args} &>/dev/null
-		eend $?
-		i=$((i+1))
-	done
 
+		i=0
+		while true; do
+			module=`eval echo '$'MODULE_${i}`
+			module_args=`eval echo '$'MODULE_${i}_ARGS`
+			if [ -z "${module}" ] ; then
+				break
+			fi
+			ebegin "  Loading ${module}"
+			modprobe ${module} ${module_args} &>/dev/null
+			eend $?
+			i=$((i+1))
+		done
+	fi
+	
 	if ! [ -f /etc/sensors.conf ] ; then
 		eerror "/etc/sensors.conf does not exist!"
 		return 1
@@ -71,38 +73,40 @@ stop() {
 
 	. /etc/conf.d/lm_sensors
 
-	if [ -z "${MODULE_0}" ] ; then
-		eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
-		return 1
-	fi
-
-	ebegin "Removing lm_sensors modules"
-	eend $?
-
-	# find the highest possible MODULE_ number
-	i=0
-	while true; do
-		module=`eval echo '$'MODULE_${i}`
-		if [ -z "${module}" ] ; then
-			break
+	if [ "$LOADMODULES" == "yes" ] ; then
+		if [ -z "${MODULE_0}" ] ; then
+			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
+			return 1
 		fi
-		i=$((i+1))
-	done
 
-	while [ ${i} -gt 0 ]; do
-		i=$((i-1))
-		module=`eval echo '$'MODULE_${i}`
-		ebegin "  Removing ${module}"
-		rmmod ${module} &>/dev/null
-		eend $?
-	done
-
-	if [ -e /proc/sys/dev/sensors ] ; then
-		ebegin "  Removing i2c-proc"
-		rmmod i2c-proc &>/dev/null
+		ebegin "Removing lm_sensors modules"
 		eend $?
+	
+		# find the highest possible MODULE_ number
+		i=0
+		while true; do
+			module=`eval echo '$'MODULE_${i}`
+			if [ -z "${module}" ] ; then
+				break
+			fi
+			i=$((i+1))
+		done
+
+		while [ ${i} -gt 0 ]; do
+			i=$((i-1))
+			module=`eval echo '$'MODULE_${i}`
+			ebegin "  Removing ${module}"
+			rmmod ${module} &>/dev/null
+			eend $?
+		done
+
+		if [ -e /proc/sys/dev/sensors ] ; then
+			ebegin "  Removing i2c-proc"
+			rmmod i2c-proc &>/dev/null
+			eend $?
+		fi
 	fi
-
+	
 	return 0
 
 }
diff --git a/sys-apps/lm-sensors/lm-sensors-2.9.0.ebuild b/sys-apps/lm-sensors/lm-sensors-2.9.0.ebuild
new file mode 100644
index 000000000000..2685bd6d8607
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-2.9.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2005 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.9.0.ebuild,v 1.1 2005/01/01 22:17:07 plasmaroo Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+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}/${PN}-2.8.8-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 "This ebuild assumes your /usr/src/linux kernel is the one you"
+	einfo "used to build i2c-${PV}."
+	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."
+	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=$(tc-getCC) I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
+	else
+		emake CC=$(tc-getCC) 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
+
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	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
+}