# ChangeLog for sys-apps/i2c
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.39 2005/08/19 15:35:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.40 2005/09/06 21:00:52 brix Exp $
+
+*i2c-2.9.2 (06 Sep 2005)
+
+ 06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+ +files/i2c-2.9.2-module-path.patch, +i2c-2.9.2.ebuild:
+ Version bump.
19 Aug 2005; Henrik Brix Andersen <brix@gentoo.org> i2c-2.9.1.ebuild:
No linux-2.4.x support for ppc.
MD5 c08347cffd5b5375c1b3951ad218307f i2c-2.9.1.ebuild 1710
MD5 7c2f9708e0d353f08be9add731cb8158 i2c-2.8.7.ebuild 3499
MD5 12a9de4bbbb793932550f17998be233b i2c-2.9.0.ebuild 2642
-MD5 0dbfc3bb66e9212d0f93434938c14b9a ChangeLog 6858
+MD5 f362f58a458362b374bcb0d5610344e8 i2c-2.9.2.ebuild 1623
+MD5 9740e2686e38d8a54788840852d46792 ChangeLog 7012
MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 853e1c19e54e6adb9cbb4e435f49847e files/i2c-2.9.2-module-path.patch 1792
MD5 9a742c848861fdb77a2ece979a81edc3 files/i2c-2.8.0-alphaCompile.patch 353
MD5 3d1523487606d28ad6cb49a5f34b1601 files/digest-i2c-2.8.7 61
MD5 09a33c917d4a0919bb6aa7d6d83402c0 files/digest-i2c-2.9.0 61
MD5 719058245870177c6519a7faae4540d4 files/digest-i2c-2.9.1 61
+MD5 966fb4a85b4c37cf171b937f3b60ea78 files/digest-i2c-2.9.2 61
MD5 bf13f28c20a1fb6338fa2ced6fe4862d files/i2c-2.9.0.fix.patch 2570
MD5 94e41662a7f774ade36247d658373f85 files/i2c-2.9.1-module-path.patch 1792
--- /dev/null
+MD5 5569049be9d17f697e2838ab5c449a41 i2c-2.9.2.tar.gz 138708
--- /dev/null
+diff -urp i2c-2.9.2/kernel/Module.mk i2c-2.9.2-module-path/kernel/Module.mk
+--- i2c-2.9.2/kernel/Module.mk 2005-09-06 21:38:20.000000000 +0200
++++ i2c-2.9.2-module-path/kernel/Module.mk 2005-09-06 22:26:07.000000000 +0200
+@@ -98,18 +98,18 @@ all :: all-kernel
+
+ #
+ # 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/ and remove old versions in misc/
++# layout, so we install in drivers/i2c/ and remove old versions in misc/
+ # Otherwise we install in misc/ as before.
+ #
+ install-kernel: all-kernel
+ if [ -n "$(KERNELTARGETS)" ] ; then \
+- $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
+- $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
++ $(MKDIR) $(DESTDIR)$(MODPREF)/drivers/i2c ; \
++ $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/drivers/i2c ; \
+ for i in $(KERNELTARGETS) ; do \
+- $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/misc/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz ; \
++ $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/misc/`basename $$i`.gz $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i`.gz ; \
+ done ; \
+ for i in i2c-elektor.o i2c-pcf-epp.o ; do \
+- $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/misc/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz ; \
++ $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/misc/`basename $$i`.gz $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i` $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i`.gz ; \
+ done ; \
+ $(RMDIR) $(DESTDIR)$(MODPREF)/misc 2> /dev/null || true ; \
+ fi
--- /dev/null
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.2.ebuild,v 1.1 2005/09/06 21:00:52 brix Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+DESCRIPTION="I2C Bus kernel modules for linux-2.4.x"
+HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
+SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+
+IUSE=""
+
+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}/${P}-module-path.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} || die "emake failed"
+}
+
+src_install() {
+ einfo
+ einfo "This package will need to overwrite your kernel I2C headers."
+ einfo "If this fails, please emerge with FEATURES=\"-collision-protect\""
+ einfo
+ ebeep 5
+
+ emake CC=$(tc-getCC) \
+ LINUX=${KV_DIR} LINUX_INCLUDE_DIR=${KV_DIR}/include/linux MODPREF=/lib/modules/${KV_FULL} \
+ DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man install \
+ || die "emake install failed"
+
+ dodoc CHANGES README TODO
+
+ dodoc doc/*
+}
# 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:
+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
--- /dev/null
+MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
--- /dev/null
+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
+
--- /dev/null
+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)
--- /dev/null
+# 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"
+}
# ChangeLog for sys-apps/lm_sensors
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.38 2005/08/26 10:25:43 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.39 2005/09/06 21:06:02 brix Exp $
+
+*lm_sensors-2.9.2 (06 Sep 2005)
+
+ 06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+ +files/lm_sensors-2.9.2-lm_sensors-init.d,
+ +files/lm_sensors-2.9.2-sensord-conf.d,
+ +files/lm_sensors-2.9.2-sensord-init.d,
+ +files/lm_sensors-2.9.2-sensors-detect-gentoo.patch,
+ +lm_sensors-2.9.2.ebuild:
+ Version bump.
26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
-files/lm_sensors-2.8.7-sensors-detect-gentoo.diff,
+MD5 4cdf5e61ee6ef5b9c6056479de5ea0f9 lm_sensors-2.9.2.ebuild 3706
MD5 593fa43923e4215d93a56f47e74c71f5 lm_sensors-2.9.1-r1.ebuild 3865
-MD5 aaad66285f87330efab8fefbe4d7d8f2 ChangeLog 14677
+MD5 e03c2885350497644de706e577adf7f3 ChangeLog 14993
MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
MD5 6caf3a2ef7bd1503aac7e3c8129c88a8 files/rc 2332
+MD5 e1ef57b66e57b34a5974d67c1bce746a files/lm_sensors-2.9.2-sensord-conf.d 225
MD5 2045929b325d2e459a6ab9236d2764eb files/lm_sensors-2.9.1-sensors-detect-gentoo.patch 5526
+MD5 019af8aadace96daa3093dee406af42f files/lm_sensors-2.9.2-sensord-init.d 622
MD5 b8924278f856bf6a5d01a476a6c6c017 files/lm_sensors-2.9.1-sensord-conf.d 342
MD5 2d203b24a5474fe336ae65203c1efe8c files/lm_sensors-2.9.1-lm_sensors-init.d 2451
MD5 46b6afde1f6a202ceaf607af2d905cd0 files/lm_sensors-2.9.1-sensord-init.d 739
MD5 512e167e34ba06a004990fc298616a20 files/lm_sensors-2.9.1-pwmconfig.patch 1186
MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-2.9.1-r1 68
+MD5 edf2235c80b178421142d5a8d04e50fa files/digest-lm_sensors-2.9.2 68
+MD5 61e30cd5cbe4e2ec74b60b356fc2112b files/lm_sensors-2.9.2-lm_sensors-init.d 2331
+MD5 ca1a12423f60961873fad394f9bba183 files/lm_sensors-2.9.2-sensors-detect-gentoo.patch 5446
--- /dev/null
+MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
--- /dev/null
+#!/sbin/runscript
+# 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/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+
+checkconfig() {
+ if [ ! -f /etc/conf.d/lm_sensors ]; then
+ eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
+ return 1
+ fi
+
+ if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
+ if [ -z "${MODULE_0}" ]; then
+ eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
+ return 1
+ fi
+ fi
+}
+
+start() {
+ checkconfig || return 1
+
+ if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
+ einfo "Loading lm_sensors modules..."
+
+ mount | grep sysfs &> /dev/null
+ if [ ${?} == 0 ]; then
+ if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
+ ebegin " Loading i2c-core"
+ modprobe i2c-core &> /dev/null
+ if [ ${?} != 0 ]; then
+ eerror " Could not load i2c-core!"
+ eend 1
+ fi
+ ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
+ eend 0
+ fi
+ elif ! [ -e /proc/sys/dev/sensors ]; then
+ ebegin " Loading i2c-proc"
+ modprobe i2c-proc &> /dev/null
+ if [ ${?} != 0 ]; then
+ eerror " Could not load i2c-proc!"
+ eend 1
+ fi
+ [ -e /proc/sys/dev/sensors ] || return 1
+ eend 0
+ fi
+
+ i=0
+ while true; do
+ module=`eval echo '$'MODULE_${i}`
+ module_args=`eval echo '$'MODULE_${i}_ARGS`
+ if [ -z "${module}" ]; then
+ break
+ fi
+ ebegin " Loading ${module}"
+ modprobe ${module} ${module_args} &> /dev/null
+ eend $?
+ i=$((i+1))
+ done
+ fi
+
+ if [ "${INITSENSORS}" = "yes" ]; then
+ if ! [ -f /etc/sensors.conf ]; then
+ eerror "/etc/sensors.conf does not exist!"
+ return 1
+ fi
+
+ ebegin "Initializing sensors"
+ /usr/bin/sensors -s &> /dev/null
+ eend ${?}
+ fi
+}
+
+stop() {
+ checkconfig || return 1
+
+ if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
+ einfo "Unloading lm_sensors modules..."
+
+ # find the highest possible MODULE_ number
+ i=0
+ while true; do
+ module=`eval echo '$'MODULE_${i}`
+ if [ -z "${module}" ] ; then
+ break
+ fi
+ i=$((i+1))
+ done
+
+ while [ ${i} -gt 0 ]; do
+ i=$((i-1))
+ module=`eval echo '$'MODULE_${i}`
+ ebegin " Unloading ${module}"
+ rmmod ${module} &> /dev/null
+ eend $?
+ done
+
+ if [ -e /proc/sys/dev/sensors ] ; then
+ ebegin " Unloading i2c-proc"
+ rmmod i2c-proc &> /dev/null
+ eend $?
+ fi
+ fi
+}
--- /dev/null
+# 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/files/lm_sensors-2.9.2-sensord-conf.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+
+# Extra options to pass to the sensord daemon,
+# see sensord(8) for more information
+SENSORD_OPTIONS=""
--- /dev/null
+#!/sbin/runscript
+# 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/files/lm_sensors-2.9.2-sensord-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+
+CONFIG=/etc/sensors.conf
+
+depend() {
+ need logger
+ use lm_sensors
+}
+
+checkconfig() {
+ if [ ! -f ${CONFIG} ]; then
+ eerror "Configuration file ${CONFIG} not found"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting sensord"
+ start-stop-daemon --start --quiet --exec /usr/sbin/sensord \
+ -- --config-file ${CONFIG} ${SENSORD_OPTIONS}
+ eend ${?}
+}
+
+stop() {
+ ebegin "Stopping sensord"
+ start-stop-daemon --stop --quiet --pidfile /var/run/sensord.pid
+ eend ${?}
+}
--- /dev/null
+diff -urp lm_sensors-2.9.2/prog/detect/sensors-detect lm_sensors-2.9.2-sensors-detect-gentoo/prog/detect/sensors-detect
+--- lm_sensors-2.9.2/prog/detect/sensors-detect 2005-09-06 21:38:10.000000000 +0200
++++ lm_sensors-2.9.2-sensors-detect-gentoo/prog/detect/sensors-detect 2005-09-06 22:43:30.000000000 +0200
+@@ -26,6 +26,14 @@
+ # each be put in a separate file, using modules and packages. That is beyond
+ # me.
+
++# Changelog
++# 02/Mar/2003, Rudo Thomas <thomr9am@ss1000.ms.mff.cuni.cz>
++# * a few small changes in config file output to reflect Gentoo Linux layout
++# - /etc/sysconfig -> /etc/conf.d
++# - /etc/rc.d/init.d -> /etc/init.d
++# - added a warning to the generated config file
++# - small change when asking about writing the new config file
++
+ require 5.004;
+
+ use strict;
+@@ -5201,39 +5209,44 @@ sub main
+ my $use_isa = not <STDIN> =~ /\s*[Ss]/;
+
+ my ($modprobes,$configfile) = generate_modprobes $use_isa;
++ print "\nIf you want to load the modules at startup, generate a config file\n",
++ "below and make sure lm_sensors gets started; e.g\n",
++ "\$ rc-update add lm_sensors default.\n";
+ print "\nTo make the sensors modules behave correctly, add these lines to\n",
+- "$modules_conf:\n\n";
++ "/etc/modules.conf:\n\n";
+ print "#----cut here----\n";
+ print $configfile;
+- print "#----cut here----\n";
+- print "\nTo load everything that is needed, add this to some /etc/rc* ",
+- "file:\n\n";
+- print "#----cut here----\n";
+- print $modprobes;
+- print "# sleep 2 # optional\n",
+- "/usr/local/bin/sensors -s # recommended\n";
+- print "#----cut here----\n";
++ print "#----end cut here----\n";
+ print "\nWARNING! If you have some things built into your kernel, the list above\n",
+ "will contain too many modules. Skip the appropriate ones! You really should\n",
+ "try these commands right now to make sure everything is working properly.\n",
+ "Monitoring programs won't work until it's done.\n";
+-
+- my $have_sysconfig = -d '/etc/sysconfig';
+- print "\nDo you want to generate /etc/sysconfig/lm_sensors? (".
+- ($have_sysconfig?"YES/no":"yes/NO")."): ";
+- if ($> != 0) {
+- print "\nAs you are not root, we shall skip this step.\n";
+- } else {
+- $_ = <STDIN>;
+- if (($have_sysconfig and not m/^\s*[Nn]/) or m/^\s*[Yy]/) {
+- unless ($have_sysconfig) {
+- mkdir '/etc/sysconfig', 0777
+- or die "Sorry, can't create /etc/sysconfig ($!)?!?";
+- }
+- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
+- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)?!?";
+- print SYSCONFIG <<'EOT';
+-# /etc/sysconfig/sensors - Defines modules loaded by /etc/rc.d/init.d/lm_sensors
++
++ print "To load everything that is needed, execute the commands above...";
++
++ print "\n\n#----cut here----\n";
++ print $modprobes;
++ print "# sleep 2 # optional\n",
++ "/usr/bin/sensors -s # recommended\n";
++
++ my $have_config = -f '/etc/conf.d/lm_sensors';
++ print "\nDo you want to ".($have_config?"overwrite":"generate").
++ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
++ " (".($have_config?"yes/NO":"YES/no")."/s): ";
++ my $reply = <STDIN>;
++
++ if (($have_config and $reply =~ /^\s*[Yy]/) or
++ (not $have_config and not $reply =~ /^\s*[Nn]/) or
++ $reply =~ /^\s*[Ss]/) {
++ my $filename = "/etc/conf.d/lm_sensors";
++ if ($reply =~ /^\s*[Ss]/) {
++ print "Specify the file to store the configuration to: ";
++ $filename = <STDIN>;
++ }
++ open(SYSCONFIG, ">".$filename)
++ or die "Sorry, can't create $filename ($!).";
++ print SYSCONFIG <<'EOT';
++# /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
+ # Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -5254,18 +5267,27 @@ sub main
+ # See also the lm_sensors homepage at:
+ # http://www2.lm-sensors.nu/~lm78/index.html
+ #
+-# This file is used by /etc/rc.d/init.d/lm_sensors and defines the modules to
+-# be loaded/unloaded. This file is sourced into /etc/rc.d/init.d/lm_sensors.
++# This file is used by /etc/init.d/lm_sensors and defines the modules to
++# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
+ #
+ # The format of this file is a shell script that simply defines the modules
+ # in order as normal variables with the special names:
+ # MODULE_0, MODULE_1, MODULE_2, etc.
+ #
++# Please note that the numbers in MODULE_X must start at 0 and increase in
++# steps of 1. Any number that is missing will make the init script skip the
++# rest of the modules. Use MODULE_X_ARGS for arguments.
++#
+ # List the modules that are to be loaded for your system
+ #
+ EOT
+ print SYSCONFIG
+- "# Generated by sensors-detect on " . scalar localtime() . "\n";
++ "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
++ print SYSCONFIG
++ "# Load modules at startup\n".
++ "LOADMODULES=yes\n\n".
++ "# Initialize sensors at startup\n".
++ "INITSENSORS=yes\n\n";
+ my @modules = grep /^modprobe /, split "\n", $modprobes;
+ my $i = 0;
+ my $sysconfig = "";
+@@ -5275,9 +5297,7 @@ EOT
+ $i++;
+ }
+ print SYSCONFIG $sysconfig;
+- print "Copy prog/init/lm_sensors.init to /etc/rc.d/init.d/lm_sensors\n";
+- print "for initialization at boot time.\n";
+- }
++ print "Done.\n";
+ }
+ }
+
--- /dev/null
+# 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/lm_sensors-2.9.2.ebuild,v 1.1 2005/09/06 21:06:02 brix Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://secure.netroedge.com/~lm78/"
+SRC_URI="http://secure.netroedge.com/~lm78/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+DEPEND="sys-apps/sed
+ ppc? ( >=virtual/linux-sources-2.5 )
+ !ppc? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="dev-lang/perl
+ sensord? ( net-analyzer/rrdtool )"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is 2 4; then
+ if use ppc; then
+ eerror
+ eerror "${P} does not support kernel 2.4.x under PPC."
+ eerror
+ die "${P} does not support kernel 2.4.x under PPC."
+ elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
+ eerror
+ eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
+ eerror "for kernel 2.4.x"
+ eerror
+ die "sys-apps/lm_sensors-modules-${PV} not installed"
+ fi
+ else
+ if ! (linux_chkconfig_present I2C_SENSOR); then
+ eerror
+ eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
+ eerror
+ die "CONFIG_I2C_SENSOR not detected"
+ fi
+ if ! (linux_chkconfig_present I2C_CHARDEV); then
+ eerror
+ eerror "${P} requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+ eerror
+ die "CONFIG_I2C_CHARDEV not detected"
+ fi
+ if ! (linux_chkconfig_present I2C); then
+ eerror
+ eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
+ eerror
+ die "CONFIG_I2C not detected"
+ fi
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${P}-sensors-detect-gentoo.patch
+
+ if use sensord; then
+ sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile
+ fi
+}
+
+src_compile() {
+ einfo
+ einfo "You may safely ignore any errors from compilation"
+ einfo "that contain \"No such file or directory\" references."
+ einfo
+
+ filter-flags -fstack-protector
+
+ emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+ || die "emake user failed"
+}
+
+src_install() {
+ emake DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
+ KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
+
+ newinitd ${FILESDIR}/${P}-lm_sensors-init.d lm_sensors
+
+ if use sensord; then
+ newconfd ${FILESDIR}/${P}-sensord-conf.d sensord
+ newinitd ${FILESDIR}/${P}-sensord-init.d sensord
+ fi
+
+ dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+ README* TODO
+
+ dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+ doc/progs doc/temperature-sensors doc/vid
+
+ dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
+
+ docinto busses
+ dodoc doc/busses/*
+
+ docinto chips
+ dodoc doc/chips/*
+
+ docinto developers
+ dodoc doc/developers/applications doc/developers/design \
+ doc/developers/new_drivers doc/developers/proc \
+ doc/developers/sysctl doc/developers/sysfs-interface
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Next you need to run:"
+ einfo " /usr/sbin/sensors-detect"
+ einfo "to detect the I2C hardware of your system and create the file:"
+ einfo " /etc/conf.d/lm_sensors"
+ einfo
+ einfo "You will also need to run the above command if you're upgrading from"
+ einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
+ einfo "changed."
+ einfo
+ einfo "Be warned, the probing of hardware in your system performed by"
+ einfo "sensors-detect could freeze your system. Also make sure you read"
+ einfo "the documentation before running lm_sensors on IBM ThinkPads."
+ einfo
+ einfo "Please see the lm_sensors documentation and website for more information."
+ einfo
+}
projects / gentoo.git / commitdiff