Fix the init-script to also rmmod i2c-core (#140051 thanks to <lefti at bk.ru>)

(Portage version: 2.1.1_pre3)

7 files changed, 312 insertions, 3 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index d12e92170b64..45d5bd3cb276 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.54 2006/07/16 09:15:05 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.55 2006/07/16 09:18:36 phreak Exp $
+
+*lm_sensors-2.10.0-r1 (16 Jul 2006)
+*lm_sensors-2.9.2-r1 (16 Jul 2006)
+
+  16 Jul 2006; Christian Heim <phreak@gentoo.org>
+  files/lm_sensors-2.9.2-lm_sensors-init.d,
+  files/lm_sensors-2.10.0-lm_sensors-init.d, +lm_sensors-2.9.2-r1.ebuild,
+  +lm_sensors-2.10.0-r1.ebuild:
+  Fix the init-script to also rmmod i2c-core (#140051 thanks to <lefti at bk.ru>)
 
   16 Jul 2006; Christian Heim <phreak@gentoo.org> lm_sensors-2.9.2.ebuild,
   lm_sensors-2.10.0.ebuild:
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1
new file mode 100644
index 000000000000..cd0598b2a998
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1
@@ -0,0 +1,3 @@
+MD5 6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz 879631
+RMD160 8bb5dd4fbb9b7fba2f60f8a8d00d7b54231ddf37 lm_sensors-2.10.0.tar.gz 879631
+SHA256 e2fe2c79dc1f219ae85606ad1e556edcd2e55adbabf8bb45dc3c11c00503050d lm_sensors-2.10.0.tar.gz 879631
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1
new file mode 100644
index 000000000000..48df55c1337f
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1
@@ -0,0 +1,3 @@
+MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
+RMD160 1facd2f05ab31d819b12da73067952d74496fbcb lm_sensors-2.9.2.tar.gz 860624
+SHA256 e40573335a895c88bdc040126fd6bb73199bef0169b2b88c6a1ef916c03803c7 lm_sensors-2.9.2.tar.gz 860624
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
index 78e40734b6b6..224906885d63 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 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.10.0-lm_sensors-init.d,v 1.1 2006/02/15 18:40:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d,v 1.2 2006/07/16 09:18:36 phreak Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
@@ -101,5 +101,11 @@ stop() {
 			rmmod i2c-proc &> /dev/null
 			eend $?
 		fi
+
+		if [[ -e /sys/i2c || /sys/bus/i2c ]] ; then
+			ebegin "  Unloading i2c-core"
+			rmmod i2c-core &> /dev/null
+			eend $?
+		fi
 	fi
 }
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
index 730b30df6c09..18bbfc781b2c 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.2 2006/07/16 09:18:36 phreak Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
@@ -101,5 +101,11 @@ stop() {
 			rmmod i2c-proc &> /dev/null
 			eend $?
 		fi
+
+		if [[ -e /sys/bus/i2c || /sys/i2c ]] ; then
+			ebegin "  Unloading i2c-core"
+			rmmod i2c-core &> /dev/null
+			eend $?
+		fi
 	fi
 }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..88c44effb949
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 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.10.0-r1.ebuild,v 1.1 2006/07/16 09:18:36 phreak Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://www.lm-sensors.org/"
+SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+
+COMMON="sys-fs/sysfsutils
+		sensord? ( net-analyzer/rrdtool )"
+DEPEND="${COMMON}
+		sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is 2 4; then
+		if use ppc || use amd64; then
+			eerror
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
+			eerror
+			die "${P} does not support kernel 2.4.x under PPC and AMD64."
+		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 kernel_is lt 2 6 14 && ! (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"
+		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
+			eerror
+			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
+			eerror
+			die "CONFIG_HWMON not detected"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			ewarn
+			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			ewarn
+		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
+	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
+
+	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
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..cabe1143aec7
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/16 09:18:36 phreak Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://www.lm-sensors.org/"
+SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+
+COMMON="sensord? ( net-analyzer/rrdtool )"
+DEPEND="${COMMON}
+		sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is 2 4; then
+		if use ppc || use amd64; then
+			eerror
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
+			eerror
+			die "${P} does not support kernel 2.4.x under PPC and AMD64."
+		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 kernel_is lt 2 6 14 && ! (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"
+		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
+			eerror
+			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
+			eerror
+			die "CONFIG_HWMON not detected"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			ewarn
+			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			ewarn
+		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
+}