Compiled against wrong headers (at least tried to)

4 files changed, 20 insertions, 22 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 08b988eebc71..7afb57b58726 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.3 2003/06/16 14:30:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.4 2003/06/23 12:26:33 phosphan Exp $
+
+  23 Jun 2003; Patrick Kursawe <phosphan@gentoo.org>
+  lm-sensors-2.7.0-r1.ebuild, files/2.7.0-wrong-headers.patch:
+  The last change made it compile against the linux-headers headers, not against
+  the installed kernel. Should get the latest i2c includes _and_ the correct
+  kernel headers now. No revision bump since this is a compile time issue.
 
   16 Jun 2003; Patrick Kursawe <phosphan@gentoo.org>
   lm-sensors-2.7.0-r1.ebuild, files/2.7.0-wrong-headers.patch:
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 663c18cf3ca6..cf1921068ede 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,10 +1,9 @@
-MD5 43a2c07b6fb180528ac78474575efa3a ChangeLog 3341
-MD5 fe44ed8975bb07d397ae50096c8ce0a0 lm-sensors-2.6.5.ebuild 1955
-MD5 5b3a568355770d28d47f264ed48b29a3 lm-sensors-2.7.0-r1.ebuild 2549
+MD5 8a84c8b870cacd0d1b40d719b7bcae1c lm-sensors-2.7.0-r1.ebuild 2679
 MD5 3b1cad58ba4278bdaf67c553efa93b1f lm-sensors-2.7.0.ebuild 2334
-MD5 cd17df75782a1058aca0d20762528370 files/2.7.0-wrong-headers.patch 561
-MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
-MD5 cf55e040bb5a4609f79212a60fa0c1c3 files/digest-lm-sensors-2.7.0 68
-MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
+MD5 04f8af52a8f9b192372bde8a1fcc1bf3 ChangeLog 3691
+MD5 fe44ed8975bb07d397ae50096c8ce0a0 lm-sensors-2.6.5.ebuild 1955
 MD5 e4127305c75208284e8eaa26a77888c4 files/rc 1534
+MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
 MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
+MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
+MD5 cf55e040bb5a4609f79212a60fa0c1c3 files/digest-lm-sensors-2.7.0 68
diff --git a/sys-apps/lm-sensors/files/2.7.0-wrong-headers.patch b/sys-apps/lm-sensors/files/2.7.0-wrong-headers.patch
deleted file mode 100644
index 28dce0bd01f3..000000000000
--- a/sys-apps/lm-sensors/files/2.7.0-wrong-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2002-12-04 16:44:32.000000000 +0100
-+++ Makefile.new	2003-06-16 16:20:04.000000000 +0200
-@@ -178,7 +178,7 @@
- # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables).
- # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
- # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
--ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
-+ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -idirafter $(LINUX_HEADERS)
- ALL_CFLAGS := -O2 
- 
- ifeq ($(DEBUG),1)
diff --git a/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild b/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
index 1586138cea97..9f5e8878a716 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.3 2003/06/21 21:19:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.7.0-r1.ebuild,v 1.4 2003/06/23 12:26:33 phosphan 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://www2.lm-sensors.nu/~lm78/archive/${MY_P}.tar.gz
 	mirror://gentoo/${P}-sensors-detect-gentoo.diff.bz2"
@@ -30,7 +32,9 @@ src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
 	patch -p 1 <../${P}-sensors-detect-gentoo.diff || die
-	patch -p 0 < ${FILESDIR}/${PV}-wrong-headers.patch || die
+	# get the right i2c includes without dropping the kernel includes
+	mkdir -p ${MYI2C}/linux
+	cp /usr/include/linux/i2c* ${MYI2C}/linux/
 }
 
 src_compile()  {
@@ -38,7 +42,7 @@ 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-2.7.0 support built as a modules this support is included in gentoo-sources as of 2.4.20-r1"
+	emake I2C_HEADERS=${MYI2C} 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() {