*sigh* and again, version bump (should have been bumped some time ago, when I bumped sys-apps/lm_sensors), thanks to David Turner <dgturner at iee.org> in #161851.

(Portage version: 2.1.2-r4)

3 files changed, 85 insertions, 0 deletions

diff --git a/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.10.2 b/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.10.2
new file mode 100644
index 000000000000..ca121518e458
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.10.2
@@ -0,0 +1,3 @@
+MD5 a424c54006483e978cc3f885f50989a5 lm_sensors-2.10.2.tar.gz 919909
+RMD160 f1e62db56ca8854ef04499622bfa26b0d0256da9 lm_sensors-2.10.2.tar.gz 919909
+SHA256 d3340b6da91ded91c1446c7daf17b9b2582cfa6c60b78f0f60ea5c66f6520ae1 lm_sensors-2.10.2.tar.gz 919909
diff --git a/sys-apps/lm_sensors-modules/files/lm_sensors-2.10.2-module-path.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.10.2-module-path.patch
new file mode 100644
index 000000000000..ce1aa30a9f86
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/lm_sensors-2.10.2-module-path.patch
@@ -0,0 +1,70 @@
+diff -urp lm_sensors-2.10.0/kernel/busses/Module.mk lm_sensors-2.10.0-module-path/kernel/busses/Module.mk
+--- lm_sensors-2.10.0/kernel/busses/Module.mk	2005-04-14 17:24:28.000000000 +0200
++++ lm_sensors-2.10.0-module-path/kernel/busses/Module.mk	2006-02-15 17:59:38.000000000 +0100
+@@ -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.10.0/kernel/chips/Module.mk lm_sensors-2.10.0-module-path/kernel/chips/Module.mk
+--- lm_sensors-2.10.0/kernel/chips/Module.mk	2006-02-15 02:46:47.000000000 +0100
++++ lm_sensors-2.10.0-module-path/kernel/chips/Module.mk	2006-02-15 17:59:38.000000000 +0100
+@@ -191,13 +191,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 ; \
+Only in lm_sensors-2.10.0-module-path/kernel/chips: Module.mk.orig
+diff -urp lm_sensors-2.10.0/prog/hotplug/Makefile.p4b lm_sensors-2.10.0-module-path/prog/hotplug/Makefile.p4b
+--- lm_sensors-2.10.0/prog/hotplug/Makefile.p4b	2003-05-31 19:30:47.000000000 +0200
++++ lm_sensors-2.10.0-module-path/prog/hotplug/Makefile.p4b	2006-02-15 17:59:38.000000000 +0100
+@@ -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.10.2-modules-only.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.10.2-modules-only.patch
new file mode 100644
index 000000000000..563bd600244b
--- /dev/null
+++ b/sys-apps/lm_sensors-modules/files/lm_sensors-2.10.2-modules-only.patch
@@ -0,0 +1,12 @@
+diff -urp lm_sensors-2.10.0/Makefile lm_sensors-2.10.0-modules-only/Makefile
+--- lm_sensors-2.10.0/Makefile	2006-02-15 02:46:46.000000000 +0100
++++ lm_sensors-2.10.0-modules-only/Makefile	2006-02-15 18:01:09.000000000 +0100
+@@ -287,6 +287,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)
+Only in lm_sensors-2.10.0-modules-only: Makefile.orig