Pruned old ebuild.

Package-Manager: portage-2.0.54

18 files changed, 24 insertions, 788 deletions

diff --git a/sys-apps/i2c/ChangeLog b/sys-apps/i2c/ChangeLog
index 0b38b9dfdd4b..fbbfff861fb7 100644
--- a/sys-apps/i2c/ChangeLog
+++ b/sys-apps/i2c/ChangeLog
@@ -1,6 +1,10 @@
 # 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.43 2005/12/14 18:40:12 brix Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.44 2006/02/01 16:56:42 brix Exp $
+
+  01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/i2c-2.9.1-module-path.patch, -i2c-2.9.1.ebuild:
+  Pruned old ebuild.
 
   14 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
   -files/i2c-2.8.0-alphaCompile.patch, -files/i2c-2.9.0.fix.patch,
diff --git a/sys-apps/i2c/files/digest-i2c-2.9.1 b/sys-apps/i2c/files/digest-i2c-2.9.1
deleted file mode 100644
index 3130cb56ca82..000000000000
--- a/sys-apps/i2c/files/digest-i2c-2.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb3d1df2d3b46f199af2485db612c76d i2c-2.9.1.tar.gz 142961
diff --git a/sys-apps/i2c/files/i2c-2.9.1-module-path.patch b/sys-apps/i2c/files/i2c-2.9.1-module-path.patch
deleted file mode 100644
index 60443dffd021..000000000000
--- a/sys-apps/i2c/files/i2c-2.9.1-module-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urp i2c-2.9.1/kernel/Module.mk i2c-2.9.1-module-path/kernel/Module.mk
---- i2c-2.9.1/kernel/Module.mk	2005-01-03 18:21:07.000000000 +0100
-+++ i2c-2.9.1-module-path/kernel/Module.mk	2005-06-04 15:09:16.000000000 +0200
-@@ -96,18 +96,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
diff --git a/sys-apps/i2c/i2c-2.9.1.ebuild b/sys-apps/i2c/i2c-2.9.1.ebuild
deleted file mode 100644
index b7b95fe57c60..000000000000
--- a/sys-apps/i2c/i2c-2.9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.1.ebuild,v 1.6 2005/11/21 19:59:52 blubb Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-DESCRIPTION="I2C Bus support for 2.4.x kernels"
-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 "${PV} requires kernel 2.4.10 or later"
-		die "${PV} requires kernel 2.4.10 or later"
-	fi
-
-	if kernel_is gt 2 4; then
-		eerror "${PV} 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 "${PV} 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/*
-}
diff --git a/sys-apps/lm_sensors-modules/ChangeLog b/sys-apps/lm_sensors-modules/ChangeLog
index 5b53e9649613..7a7b3ab0f99f 100644
--- a/sys-apps/lm_sensors-modules/ChangeLog
+++ b/sys-apps/lm_sensors-modules/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2005/10/23 12:51:09 brix Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/ChangeLog,v 1.7 2006/02/01 16:55:07 brix Exp $
+
+  01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/lm_sensors-2.9.1-module-path.patch,
+  -files/lm_sensors-2.9.1-modules-only.patch,
+  -lm_sensors-modules-2.9.1.ebuild:
+  Pruned old ebuild.
 
   23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
   lm_sensors-modules-2.9.1.ebuild, lm_sensors-modules-2.9.2.ebuild:
diff --git a/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.1 b/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.1
deleted file mode 100644
index 9b9f92a218ca..000000000000
--- a/sys-apps/lm_sensors-modules/files/digest-lm_sensors-modules-2.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5af615e39441d95471bdb72a3f01709 lm_sensors-2.9.1.tar.gz 870765
diff --git a/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.1-module-path.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.1-module-path.patch
deleted file mode 100644
index e46fabcb3844..000000000000
--- a/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.1-module-path.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urp lm_sensors-2.9.1/kernel/busses/Module.mk lm_sensors-2.9.1-module-path/kernel/busses/Module.mk
---- lm_sensors-2.9.1/kernel/busses/Module.mk	2004-11-14 15:28:09.000000000 +0100
-+++ lm_sensors-2.9.1-module-path/kernel/busses/Module.mk	2005-06-04 15:29:59.000000000 +0200
-@@ -105,16 +105,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.1/kernel/chips/Module.mk lm_sensors-2.9.1-module-path/kernel/chips/Module.mk
---- lm_sensors-2.9.1/kernel/chips/Module.mk	2005-03-10 20:03:52.000000000 +0100
-+++ lm_sensors-2.9.1-module-path/kernel/chips/Module.mk	2005-06-04 15:29:45.000000000 +0200
-@@ -186,13 +186,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.1/prog/hotplug/Makefile.p4b lm_sensors-2.9.1-module-path/prog/hotplug/Makefile.p4b
---- lm_sensors-2.9.1/prog/hotplug/Makefile.p4b	2003-05-31 19:30:47.000000000 +0200
-+++ lm_sensors-2.9.1-module-path/prog/hotplug/Makefile.p4b	2005-06-04 15:29:25.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.1-modules-only.patch b/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.1-modules-only.patch
deleted file mode 100644
index e8b532fa7d29..000000000000
--- a/sys-apps/lm_sensors-modules/files/lm_sensors-2.9.1-modules-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Only in lm_sensors-2.9.1: lm_sensors-2.9.1-modules-only.patch
-diff -urp lm_sensors-2.9.1/Makefile lm_sensors-2.9.1-modules-only/Makefile
---- lm_sensors-2.9.1/Makefile	2005-03-19 12:18:17.000000000 +0100
-+++ lm_sensors-2.9.1-modules-only/Makefile	2005-06-11 12:53:34.000000000 +0200
-@@ -258,6 +258,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.1.ebuild b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild
deleted file mode 100644
index 0e68f38ede31..000000000000
--- a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.1.ebuild,v 1.4 2005/10/23 12:51:09 brix Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-MY_P=${P/-modules/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Linux System Hardware Monitoring kernel modules for Linux-2.4"
-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 "${PV} requires kernel 2.4.10 or later"
-		die "${PV} requires kernel 2.4.10 or later"
-	fi
-
-	if kernel_is gt 2 4; then
-		eerror "${PV} 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 "${PV} 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"
-}
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 0be9c9fb8199..5c36bdf292e2 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.46 2006/01/27 19:33:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.47 2006/02/01 16:53:21 brix Exp $
+
+  01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/lm_sensors-2.9.1-lm_sensors-init.d,
+  -files/lm_sensors-2.9.1-pwmconfig.patch,
+  -files/lm_sensors-2.9.1-sensord-conf.d,
+  -files/lm_sensors-2.9.1-sensord-init.d,
+  -files/lm_sensors-2.9.1-sensors-detect-gentoo.patch, -files/rc,
+  -lm_sensors-2.9.1-r1.ebuild:
+  Pruned old ebuild.
 
   27 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
   lm_sensors-2.9.2.ebuild:
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1
deleted file mode 100644
index 9b9f92a218ca..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5af615e39441d95471bdb72a3f01709 lm_sensors-2.9.1.tar.gz 870765
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d
deleted file mode 100644
index 5adadecf56e9..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/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.1-lm_sensors-init.d,v 1.1 2005/06/11 11:28:20 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
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch
deleted file mode 100644
index af214e768afb..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urp lm_sensors-2.9.1/prog/pwm/pwmconfig /home/brix/projects/lm_sensors/lm_sensors2/prog/pwm/pwmconfig
---- lm_sensors-2.9.1/prog/pwm/pwmconfig	2005-03-15 20:24:25.000000000 +0100
-+++ /home/brix/projects/lm_sensors/lm_sensors2/prog/pwm/pwmconfig	2005-08-21 15:15:41.000000000 +0200
-@@ -465,9 +465,11 @@ function TestMinStop {
- function SaveConfig {
- 	echo
- 	echo "Saving configuration to $FCCONFIG..."
--	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >/tmp/fancontrol
--	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol
--	mv /tmp/fancontrol $FCCONFIG
-+	tmpfile=`tempfile` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-+	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile
-+	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile
-+	mv $tmpfile $FCCONFIG
- 	#check if file was written correctly
- 	echo 'Configuration saved'
- }
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d
deleted file mode 100644
index 89672f74d38d..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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.1-sensord-conf.d,v 1.1 2005/06/11 11:28:20 brix Exp $
-
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d
deleted file mode 100644
index b5795e9e982a..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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.1-sensord-init.d,v 1.1 2005/06/11 11:28:20 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 ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensors-detect-gentoo.patch
deleted file mode 100644
index 90c1226d6acb..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -urp lm_sensors-2.9.1/prog/detect/sensors-detect lm_sensors-2.9.1-sensors-detect-gentoo/prog/detect/sensors-detect
---- lm_sensors-2.9.1/prog/detect/sensors-detect	2005-03-28 01:10:52.000000000 +0200
-+++ lm_sensors-2.9.1-sensors-detect-gentoo/prog/detect/sensors-detect	2005-06-05 14:10:01.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;
-@@ -5143,39 +5151,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
-@@ -5196,18 +5209,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 = "";
-@@ -5217,9 +5239,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";
-   }
- }
- 
-Only in lm_sensors-2.9.1-sensors-detect-gentoo/prog/detect: sensors-detect.orig
diff --git a/sys-apps/lm_sensors/files/rc b/sys-apps/lm_sensors/files/rc
deleted file mode 100644
index a8baed5c2539..000000000000
--- a/sys-apps/lm_sensors/files/rc
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/sbin/runscript
-
-start() {
-	if ! [ -f /etc/conf.d/lm_sensors ] ; then
-		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
-		return 1
-	fi
-
-	. /etc/conf.d/lm_sensors
-
-	if [ -z "${NOLOADMODULES}" ] ; 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
-
-		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 ! [ -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 $?
-
-	return 0
-}
-
-stop() {
-	if ! [ -f /etc/conf.d/lm_sensors ] ; then
-		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
-		return 1
-	fi
-
-	. /etc/conf.d/lm_sensors
-
-	if [ -z "${NOLOADMODULES}" ] ; 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
-
-		ebegin "Removing lm_sensors modules"
-		eend $?
-	
-		# 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 "  Removing ${module}"
-			rmmod ${module} &>/dev/null
-			eend $?
-		done
-
-		if [ -e /proc/sys/dev/sensors ] ; then
-			ebegin "  Removing i2c-proc"
-			rmmod i2c-proc &>/dev/null
-			eend $?
-		fi
-	fi
-	
-	return 0
-
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
deleted file mode 100644
index 1213763eac55..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.1-r1.ebuild,v 1.5 2005/10/23 12:48:46 brix Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Linux System 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 )
-		amd64? ( >=virtual/linux-sources-2.5 )
-		x86? ( || (  >=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 || 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 ! (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
-	epatch ${FILESDIR}/${P}-pwmconfig.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
-}