Version bump.

(Portage version: 2.0.51.22-r2)

6 files changed, 158 insertions, 2 deletions

diff --git a/sys-apps/lm_sensors-modules/ChangeLog b/sys-apps/lm_sensors-modules/ChangeLog
index b52bde36d585..d46a6a85e33d 100644
--- a/sys-apps/lm_sensors-modules/ChangeLog
+++ b/sys-apps/lm_sensors-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/lm_sensors-modules
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/ChangeLog,v 1.3 2005/08/19 15:35:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/ChangeLog,v 1.4 2005/09/06 21:04:02 brix Exp $
+
+*lm_sensors-modules-2.9.2 (06 Sep 2005)
+
+  06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/lm_sensors-2.9.2-module-path.patch,
+  +files/lm_sensors-2.9.2-modules-only.patch,
+  +lm_sensors-modules-2.9.2.ebuild:
+  Version bump.
 
   19 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   lm_sensors-modules-2.9.1.ebuild:
diff --git a/sys-apps/lm_sensors-modules/Manifest b/sys-apps/lm_sensors-modules/Manifest
index 9c6c1fce672d..45c619ea9b6b 100644
--- a/sys-apps/lm_sensors-modules/Manifest
+++ b/sys-apps/lm_sensors-modules/Manifest
@@ -1,6 +1,10 @@
+MD5 1daa54e73dcff65a7c73f3e6feeb309c lm_sensors-modules-2.9.2.ebuild 1498
 MD5 48d653df08c08e7cfc1c56e38a5c22cd lm_sensors-modules-2.9.1.ebuild 1631
-MD5 47d2261e36868cab38d05cf19d67772c ChangeLog 710
+MD5 dea6b0b28994bf120bcb4de6b41a7559 ChangeLog 949
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 bc5cf1f60bec6bdb0fb095a5a361d1c1 files/lm_sensors-2.9.1-module-path.patch 4167
 MD5 3239330829a0de6eb11ba47d95662763 files/lm_sensors-2.9.1-modules-only.patch 524
+MD5 3588d17a38ada4fb0b52694bf5cdfa1b files/lm_sensors-2.9.2-modules-only.patch 462
+MD5 c8107273b4ca9fd900d92782882c4b9d files/lm_sensors-2.9.2-module-path.patch 4167
 MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-modules-2.9.1 68
+MD5 edf2235c80b178421142d5a8d04e50fa files/digest-lm_sensors-modules-2.9.2 68
diff --git a/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.2 b/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.2
new file mode 100644
index 000000000000..71fa4ef59c8c
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.2
@@ -0,0 +1 @@
+MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
diff --git a/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-module-path.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-module-path.patch
new file mode 100644
index 000000000000..c1114921e6a4
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-module-path.patch
@@ -0,0 +1,69 @@
+diff -urp lm_sensors-2.9.2/kernel/busses/Module.mk lm_sensors-2.9.2-module-path/kernel/busses/Module.mk
+--- lm_sensors-2.9.2/kernel/busses/Module.mk	2005-09-06 21:38:10.000000000 +0200
++++ lm_sensors-2.9.2-module-path/kernel/busses/Module.mk	2005-09-06 22:36:30.000000000 +0200
+@@ -108,16 +108,16 @@ all :: all-kernel-busses
+ 
+ #
+ # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
+-# layout, so we install in kernel/drivers/i2c/busses and remove old versions in misc/
+-# and kernel/drivers/i2c/ . Otherwise we install in misc/ as before.
++# layout, so we install in drivers/i2c/busses and remove old versions in misc/
++# and drivers/i2c/ . Otherwise we install in misc/ as before.
+ #
+ install-kernel-busses: all-kernel-busses
+ 	if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
+-	  $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+-	  $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
++	  $(MKDIR) $(DESTDIR)$(MODPREF)/drivers/i2c/busses ; \
++	  $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/drivers/i2c/busses ; \
+ 	  for i in $(KERNELBUSSESTARGETS) ; do \
+-	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` \
+-	          $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses/`basename $$i`.gz ; \
++	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i` \
++	          $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/drivers/i2c/busses/`basename $$i`.gz ; \
+ 	  done ; \
+ 	  $(RMDIR) $(DESTDIR)$(MODPREF)/misc 2> /dev/null || true ; \
+ 	fi
+diff -urp lm_sensors-2.9.2/kernel/chips/Module.mk lm_sensors-2.9.2-module-path/kernel/chips/Module.mk
+--- lm_sensors-2.9.2/kernel/chips/Module.mk	2005-09-06 21:38:10.000000000 +0200
++++ lm_sensors-2.9.2-module-path/kernel/chips/Module.mk	2005-09-06 22:36:30.000000000 +0200
+@@ -188,13 +188,13 @@ all :: all-kernel-chips
+ 
+ #
+ # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
+-# layout, so we install in kernel/drivers/i2c/chips/ and remove old versions in misc/
++# layout, so we install in drivers/i2c/chips/ and remove old versions in misc/
+ # and kernel/drivers/sensors/ . Otherwise we install in misc/ as before.
+ #
+ install-kernel-chips: all-kernel-chips
+ 	if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
+-	  $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+-	  $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
++	  $(MKDIR) $(DESTDIR)$(MODPREF)/drivers/i2c/chips ; \
++	  $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/drivers/i2c/chips ; \
+ 	  for i in $(KERNELCHIPSTARGETS) ; do \
+ 	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` \
+ 	          $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/chips/`basename $$i`.gz ; \
+diff -urp lm_sensors-2.9.2/prog/hotplug/Makefile.p4b lm_sensors-2.9.2-module-path/prog/hotplug/Makefile.p4b
+--- lm_sensors-2.9.2/prog/hotplug/Makefile.p4b	2003-05-31 19:30:47.000000000 +0200
++++ lm_sensors-2.9.2-module-path/prog/hotplug/Makefile.p4b	2005-09-06 22:36:30.000000000 +0200
+@@ -44,15 +44,15 @@ OBJS = p4b_smbus.o
+ all: $(OBJS)
+ 
+ install: all
+-	install -d /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
+-	install -c p4b_smbus.o /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
++	install -d /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
++	install -c p4b_smbus.o /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
+ #	test ! -x /dev/watchdog || mknod -m 600 /dev/watchdog c 10 130
+ #	test ! -x /dev/temperature || mknod -m 600 /dev/temperature c 10 131
+ 
+ inst: all
+ 	rmmod p4b_smbus
+-	install -d /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
+-	install -c p4b_smbus.o /lib/modules/$(KERNEL)/kernel/drivers/i2c/busses
++	install -d /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
++	install -c p4b_smbus.o /lib/modules/$(KERNEL)/drivers/i2c/busses
+ 	depmod -a
+ #	modprobe p4b_smbus
+ 
diff --git a/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-modules-only.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-modules-only.patch
new file mode 100644
index 000000000000..6e5af5e86988
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.2-modules-only.patch
@@ -0,0 +1,11 @@
+diff -urp lm_sensors-2.9.2/Makefile lm_sensors-2.9.2-modules-only/Makefile
+--- lm_sensors-2.9.2/Makefile	2005-09-06 21:38:09.000000000 +0200
++++ lm_sensors-2.9.2-modules-only/Makefile	2005-09-06 22:38:06.000000000 +0200
+@@ -268,6 +268,7 @@ all::
+ 
+ # Include all makefiles for sub-modules
+ INCLUDEFILES := 
++SRCDIRS=kernel kernel/busses kernel/chips
+ include $(patsubst %,%/Module.mk,$(SRCDIRS))
+ ifneq ($(MAKECMDGOALS),clean)
+ ifneq ($(MAKECMDGOALS),uninstall)
diff --git a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild
new file mode 100644
index 000000000000..b74c5197096f
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild
@@ -0,0 +1,63 @@
+# 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-modules/lm_sensors-modules-2.9.2.ebuild,v 1.1 2005/09/06 21:04:02 brix Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+MY_P=${P/-modules/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Hardware Monitoring kernel modules for linux-2.4.x"
+HOMEPAGE="http://secure.netroedge.com/~lm78/"
+SRC_URI="http://secure.netroedge.com/~lm78/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+
+IUSE=""
+DEPEND="sys-apps/i2c"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 4 10; then
+		eerror "${P} requires kernel 2.4.10 or later"
+		die "${P} requires kernel 2.4.10 or later"
+	fi
+
+	if kernel_is gt 2 4; then
+		eerror "${P} is only needed for kernel 2.4.x"
+		eerror "You need to use the in-kernel I2C drivers for later kernels."
+		die "Non 2.4.x kernel detected"
+	fi
+
+	if linux_chkconfig_present I2C; then
+		eerror "${P} requires kernel CONFIG_I2C to be disabled."
+		die "Kernel with CONFIG_I2C detected"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-module-path.patch
+	epatch ${FILESDIR}/${MY_P}-modules-only.patch
+}
+
+src_compile()  {
+	einfo
+	einfo "You may safely ignore any errors from compilation"
+	einfo "that contain \"No such file or directory\" references."
+	einfo
+
+	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake CC=$(tc-getCC) \
+		LINUX=${KV_DIR} MODPREF=/lib/modules/${KV_FULL} DESTDIR=${D} install \
+		|| die "emake install failed"
+}