Version bump - I had to remove some KEYWORDS in 2.6.5 as gentoo-sources was not available for it.

6 files changed, 23 insertions, 18 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index f471b7a62aff..d2b7bd771091 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.17 2004/01/25 23:20:56 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.18 2004/02/01 23:23:45 plasmaroo Exp $
+
+*lm-sensors-2.8.3 (01 Feb 2004)
+
+  01 Feb 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.2.20040111.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild:
+  Version bump; closes bug #40112.
 
   25 Jan 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
   lm-sensors-2.8.2.20040111.ebuild, lm-sensors-2.8.2.ebuild:
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2.20040111 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2.20040111
deleted file mode 100644
index f0418fcd6227..000000000000
--- a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.2.20040111
+++ /dev/null
@@ -1 +0,0 @@
-MD5 042068157667b9f674e3ba4b872cc045 lm_sensors-2.8.2.20040111.tar.gz 742574
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
new file mode 100644
index 000000000000..be7af5190657
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.3
@@ -0,0 +1 @@
+MD5 bb5dff9faa23e414e99383258cd1f532 lm_sensors-2.8.3.tar.gz 722171
diff --git a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild b/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
index 40316c1d11c6..f9f9f7fe0e07 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.6.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.6.5.ebuild,v 1.5 2004/01/04 18:29:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild,v 1.6 2004/02/01 23:23:45 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc -sparc"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="virtual/linux-sources"
 
@@ -21,13 +21,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/no-isadump-ppc.patch
-
 }
 
 src_compile()  {
-
 	filter-flags -fPIC
-
 	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and i2c support built as a modules"
 }
 
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 9b234fcc5a63..99e181df70be 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 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.7 2004/01/25 23:20:56 plasmaroo Exp $
+# $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
 
@@ -13,9 +13,7 @@ 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"
 
@@ -74,7 +72,7 @@ src_compile()  {
 	fi
 
 	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
-		cp $LINUX/include/linux/i2c* ${MYI2C}/linux
+		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
 	fi
 
 	echo; einfo "You may safely ignore any errors from compilation"
@@ -85,6 +83,9 @@ src_compile()  {
 
 	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
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.2.20040111.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
index d6f0be37752b..2f97e1e90f25 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.2.20040111.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.3.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.2.20040111.ebuild,v 1.3 2004/01/25 23:20:56 plasmaroo Exp $
+# $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
 
@@ -9,13 +9,11 @@ S="${WORKDIR}/${MY_P}"
 MYI2C="${WORKDIR}/i2c-headers"
 
 DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
-SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/${PN}/${MY_P}.tar.gz"
+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"
 
@@ -74,7 +72,7 @@ src_compile()  {
 	fi
 
 	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
-		cp $LINUX/include/linux/i2c* ${MYI2C}/linux
+		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
 	fi
 
 	echo; einfo "You may safely ignore any errors from compilation"
@@ -85,6 +83,9 @@ src_compile()  {
 
 	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