fix syntax, thanks to Andy Kriger <andy.kriger@verizon.net> in bug #45759. Also remove crufty versions

12 files changed, 10 insertions, 602 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index f5e1bb2e5ec1..cb5d25cc358d 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.21 2004/03/06 21:42:32 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.22 2004/03/26 07:46:01 seemant Exp $
+
+  25 Mar 2004; Seemant Kulleen <seemant@gentoo.org> lm-sensors-2.7.0.ebuild,
+  lm-sensors-2.8.0.ebuild, lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild,
+  lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild:
+  fix syntax, thanks to Andy Kriger <andy.kriger@verizon.net> in bug #45759.
+  Also remove crufty versions
 
 *lm-sensors-2.8.5 (06 Mar 2004)
 
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.7.0 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.7.0
deleted file mode 100644
index 4fcb22c216b5..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ccf267a4e5d2d7dfa176750886f6939 lm_sensors-2.7.0.tar.gz 595379
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.0 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.0
deleted file mode 100644
index 86a92d2c87de..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 228d3536e51f017e45aa5f21973ced0d lm_sensors-2.8.0.tar.gz 670987
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
deleted file mode 100644
index 39cab2da9d02..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e38406adca7db7e1e761269e4de8b248 lm_sensors-2.8.2.tar.gz 717184
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.3 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.3
deleted file mode 100644
index be7af5190657..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb5dff9faa23e414e99383258cd1f532 lm_sensors-2.8.3.tar.gz 722171
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.4 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.4
deleted file mode 100644
index 253a64e6623d..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1c317d116234f3767d0bcd6817bf7a4 lm_sensors-2.8.4.tar.gz 725164
diff --git a/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild b/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild
deleted file mode 100644
index cc827ca1515a..000000000000
--- a/sys-apps/lm-sensors/lm-sensors-2.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 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.7.0.ebuild,v 1.7 2004/01/04 18:29:46 plasmaroo Exp $
-
-inherit flag-o-matic
-
-MY_P=${PN/-/_}-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
-SRC_URI="http://www2.lm-sensors.nu/~lm78/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.7.0"
-
-src_compile()  {
-	check_KV
-
-	filter-flags -fPIC
-
-	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and >=i2c-2.7.0 support built as a modules this support is included in gentoo-sources as of 2.4.20-r1"
-}
-
-src_install() {
-	einstall DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc_lm_sensors lm_sensors
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL \
-		QUICKSTART README* RPM TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-
-	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
-}
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild
deleted file mode 100644
index b93a1c86aa48..000000000000
--- a/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2004 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.0.ebuild,v 1.9 2004/01/04 20:12:25 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}"
-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 || 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.0. and is >=2.4.9 && < 2.5+"
-	einfo
-	einfo "For 2.5+ series kernels, use the support already in the kernel"
-	einfo "under 'Character devices' -> 'I2C support'."
-	einfo
-	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
-	einfo "or symlink /usr/src/linux to another kernel."
-	einfo
-	einfo "*****************************************************************"
-	echo
-
-	if [ "$LINUX" != "" ]; then
-		einfo "Cross-compiling using:- $LINUX"
-		einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
-		LINUX=`echo $LINUX | sed 's/build\//build/'`
-	else
-		einfo "You are running:- `uname -r`"
-		check_KV || die "Cannot find kernel in /usr/src/linux"
-		einfo "Using kernel in /usr/src/linux/:- ${KV}"
-
-		echo ${KV} | grep 2.4. > /dev/null
-		if [ $? == 1 ]; then
-			eerror "Kernel version in /usr/src/linux is not 2.4.x"
-			eerror "Please specify a 2.4.x kernel!"
-			die "Incompatible Kernel"
-		else
-			LINUX='/usr/src/linux'
-		fi
-
-		if [ "${KV}" != "`uname -r`" ]; then
-			ewarn "WARNING:- kernels do not match!"
-		fi
-	fi
-
-	echo
-	sleep 2
-
-	check_KV
-	filter-flags -fPIC
-
-	cd ${S}
-	emake clean
-	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."
-}
-
-src_install() {
-
-	einstall LINUX=$LINUX DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc lm_sensors
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
-		README* RPM TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-
-	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
-}
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
deleted file mode 100644
index 99e181df70be..000000000000
--- a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 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.8 2004/02/01 23:23:45 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}"
-
-KEYWORDS="~x86 ~amd64 -ppc -sparc"
-LICENSE="GPL-2"
-
-DEPEND=""
-
-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
-
-	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
-	filter-flags -fPIC -fstack-protector
-
-	cd ${S}
-	emake clean
-
-	rm kernel/chips/via686a.d
-	rm kernel/chips/vt1211.d
-	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
-}
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
deleted file mode 100644
index 2f97e1e90f25..000000000000
--- a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 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.3.ebuild,v 1.1 2004/02/01 23:23:45 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}"
-
-KEYWORDS="~x86 ~amd64 -ppc -sparc"
-LICENSE="GPL-2"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${PN}-2.8.2-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
-
-	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
-	filter-flags -fPIC -fstack-protector
-
-	cd ${S}
-	emake clean
-
-	rm kernel/chips/via686a.d
-	rm kernel/chips/vt1211.d
-	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
-}
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
deleted file mode 100644
index 20626159cdf3..000000000000
--- a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2004 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.4.ebuild,v 1.1 2004/02/10 07:54:39 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}"
-
-KEYWORDS="~x86 ~amd64 -ppc -sparc"
-LICENSE="GPL-2"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${PN}-2.8.2-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
-
-	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
-	filter-flags -fPIC -fstack-protector
-
-	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
-}
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 fcf8c9a47053..be7f06227468 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 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.5.ebuild,v 1.1 2004/03/06 21:42:32 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild,v 1.2 2004/03/26 07:46:01 seemant Exp $
 
 inherit flag-o-matic
 
@@ -50,9 +50,9 @@ src_compile()  {
 	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/"//'`
+		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!"
+			die "Could not get kernel version; make sure ${LINUX}/include/linux/version.h is there!"
 		fi
 	else
 		LINUX='/usr/src/linux'