Version bump thanks to cilly <cilly@cilly.mine.nu> in bug 186720

Package-Manager: portage-2.1.3_rc9

5 files changed, 284 insertions, 5 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 9a7640fe828e..2d936dcdfa85 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.74 2007/07/03 13:40:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.75 2007/07/30 23:12:24 genstef Exp $
+
+*lm_sensors-2.10.4 (30 Jul 2007)
+
+  30 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/lm_sensors-2.10.4-sensors-detect-gentoo.patch,
+  +lm_sensors-2.10.4.ebuild:
+  Version bump thanks to cilly <cilly@cilly.mine.nu> in bug 186720
 
   03 Jul 2007; Raúl Porcel <armin76@gentoo.org> lm_sensors-2.10.3.ebuild:
   Add ~alpha wrt #144319
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 175725e94ca7..a2caaf12429a 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -6,6 +6,10 @@ AUX lm_sensors-2.10.1-sensors-detect-gentoo.patch 4717 RMD160 366baff74ee7625ead
 MD5 ba0f3cd8c71107037450042390c4bd52 files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4717
 RMD160 366baff74ee7625eade5d66f794a764038f3f3ef files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4717
 SHA256 22daf5740914cebe20f9d88e31d7b8ab9ca2bf6735c30bc1c12ba3aed9956f04 files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4717
+AUX lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350 RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 SHA1 3ba0c151f1dbecfed52444561c73897902270574 SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b
+MD5 3cb99c7aa16f87c746c2fb246986ba3a files/lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350
+RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 files/lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350
+SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b files/lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350
 AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a
 MD5 2927ba1f175889afcc9c1964bbc92289 files/lm_sensors-init.d 2457
 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 files/lm_sensors-init.d 2457
@@ -21,6 +25,7 @@ SHA256 9f6d0e7bcdc1b4b3bc0835b40f246f7caf76e1b3bbfcf76a5d5b235eb8243d89 files/se
 DIST lm_sensors-2.10.1.tar.gz 909117 RMD160 46e13ed34cd658a894c2acbae31b436b293cfcda SHA1 c7477d83a8e0e7280a8b7c73d4fc7fbf0c0521a4 SHA256 a332cacfa9d0eed6e9158c394db714e536f38c27451d7df08b9634952118fa1b
 DIST lm_sensors-2.10.2.tar.gz 919909 RMD160 f1e62db56ca8854ef04499622bfa26b0d0256da9 SHA1 573d4cd78bf42fa546260a15c57d22fed64fb899 SHA256 d3340b6da91ded91c1446c7daf17b9b2582cfa6c60b78f0f60ea5c66f6520ae1
 DIST lm_sensors-2.10.3.tar.gz 920926 RMD160 4a364543fbab80ccaa31e7c6de712f19882cc9f0 SHA1 04ec7e4e8a0506808046ab97fa7fcf390b0671cf SHA256 91c7189829491554132f86df8c8914b2f7d1a63be7011b17b323ff9da7375ca5
+DIST lm_sensors-2.10.4.tar.gz 932773 RMD160 d181d887b40c8f933e1e48aa06dfc15fbd0cf9fc SHA1 f3a741900971d8748d63acfc4df191a36690738c SHA256 205ca01af602b6b3e798b204a1c79fd46df8c70ce2ad67edd17be53ea559e05f
 EBUILD lm_sensors-2.10.1.ebuild 4417 RMD160 d9e1b59fe48ffbf52d51af872555a1686ccabd5e SHA1 0bc48c5386f6b166068361ecd4a5cfff728cb048 SHA256 abf55bdb46f5cc92881839dd44f3b7121a9dba7d869d3ac2a09f63a81539aba2
 MD5 2794b433aedc5984c64fd0566a3910fc lm_sensors-2.10.1.ebuild 4417
 RMD160 d9e1b59fe48ffbf52d51af872555a1686ccabd5e lm_sensors-2.10.1.ebuild 4417
@@ -33,10 +38,14 @@ EBUILD lm_sensors-2.10.3.ebuild 4466 RMD160 98e1b74252bc102240d3c56b278071026d5f
 MD5 ddeeb0791978b3ec14bc465068ae33af lm_sensors-2.10.3.ebuild 4466
 RMD160 98e1b74252bc102240d3c56b278071026d5ffec7 lm_sensors-2.10.3.ebuild 4466
 SHA256 1b566d1888680e5afa56f3cbf59e161f91973058a03863ab43aaa7fff1e3384b lm_sensors-2.10.3.ebuild 4466
-MISC ChangeLog 7060 RMD160 5f5efee5c1b6b32b9f528faceb8c09a7dbdff312 SHA1 0c5967de991fdc20789f463559970a62e121e862 SHA256 60cb2b4584e1258bdcc1e7c2d433b9b9b500a14effe4c33c3d994a8057961562
-MD5 ffdf542c3866b6ea4e90d99a33f93fae ChangeLog 7060
-RMD160 5f5efee5c1b6b32b9f528faceb8c09a7dbdff312 ChangeLog 7060
-SHA256 60cb2b4584e1258bdcc1e7c2d433b9b9b500a14effe4c33c3d994a8057961562 ChangeLog 7060
+EBUILD lm_sensors-2.10.4.ebuild 4466 RMD160 f69667ca9fda137840c227b99e0459682fa7ed80 SHA1 cfe96f2dd55c9c8174f3328babba1f1b81218db0 SHA256 cbb3b409130bff043e1d9c0773773e8e664fa007ba87a6c545705b9372c4b3bc
+MD5 1dc63e739058edee96c1f8411c7b4ae0 lm_sensors-2.10.4.ebuild 4466
+RMD160 f69667ca9fda137840c227b99e0459682fa7ed80 lm_sensors-2.10.4.ebuild 4466
+SHA256 cbb3b409130bff043e1d9c0773773e8e664fa007ba87a6c545705b9372c4b3bc lm_sensors-2.10.4.ebuild 4466
+MISC ChangeLog 7300 RMD160 23d2f9322a21be54ce9d9c680f898f3f79ae6547 SHA1 d161bf9d66a43cc1c2d031c9ee35a70ea48378b2 SHA256 a949bd6481293425626788fe0c0336ba66ed88d2525b89d0b1c4811b68bbcdbb
+MD5 4d99d7834605980486c5355336187a54 ChangeLog 7300
+RMD160 23d2f9322a21be54ce9d9c680f898f3f79ae6547 ChangeLog 7300
+SHA256 a949bd6481293425626788fe0c0336ba66ed88d2525b89d0b1c4811b68bbcdbb ChangeLog 7300
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 MD5 ef08587bc47655d768c868f586721d8e metadata.xml 160
 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 metadata.xml 160
@@ -50,3 +59,6 @@ SHA256 a1ffe7fa659298e4dbf511fe13934fe663c04e48ab833004c1215c3b5767cd11 files/di
 MD5 92575cc0249b315fc8330069d90f608d files/digest-lm_sensors-2.10.3 253
 RMD160 c98ddfeb8d4739416a0fa008f4c328b931d73200 files/digest-lm_sensors-2.10.3 253
 SHA256 44da3e8a30a982f7636542df60710e8f6220b9a87738e1bc994e2b38847a026a files/digest-lm_sensors-2.10.3 253
+MD5 bdf31b0920104cf0310c817cbe7f21ec files/digest-lm_sensors-2.10.4 253
+RMD160 8b18263e0e4f246283cc43d7101a7155a97e333a files/digest-lm_sensors-2.10.4 253
+SHA256 d0c36e19399cd72ac9174bbe9ce4bc212f6536fdcb202862eb07701a1e2cf60b files/digest-lm_sensors-2.10.4 253
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4
new file mode 100644
index 000000000000..6285e456f78d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4
@@ -0,0 +1,3 @@
+MD5 96eb9ca1a1f1cb308757a7b8f0af93d6 lm_sensors-2.10.4.tar.gz 932773
+RMD160 d181d887b40c8f933e1e48aa06dfc15fbd0cf9fc lm_sensors-2.10.4.tar.gz 932773
+SHA256 205ca01af602b6b3e798b204a1c79fd46df8c70ce2ad67edd17be53ea559e05f lm_sensors-2.10.4.tar.gz 932773
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch
new file mode 100644
index 000000000000..00b76b992b0d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch
@@ -0,0 +1,111 @@
+diff -ur lm_sensors-2.10.4.orig/prog/detect/sensors-detect lm_sensors-2.10.4/prog/detect/sensors-detect
+--- lm_sensors-2.10.4.orig/prog/detect/sensors-detect	2007-07-31 00:41:52.000000000 +0200
++++ lm_sensors-2.10.4/prog/detect/sensors-detect	2007-07-31 00:45:12.000000000 +0200
+@@ -27,6 +27,9 @@
+ # each be put in a separate file, using modules and packages. That is beyond
+ # me.
+ 
++# Gentoo specific modifications based on a patch from Rudo Thomas
++# <thomr9am@ss1000.ms.mff.cuni.cz>
++
+ require 5.004;
+ 
+ use strict;
+@@ -5708,8 +5711,11 @@
+      
+   print "\n";
+   my ($modprobes, $configfile) = generate_modprobes 1;	# 1 == prefer ISA
++  print "\nIf you want to load the modules at startup, generate a config file\n",
++        "below and make sure lm_sensors gets started at boot time; e.g\n",
++        "\$ rc-update add lm_sensors default\n";
+   print "To make the sensors modules behave correctly, add these lines to\n".
+-        "$modules_conf:\n\n";
++        "/etc/modules.d/lm_sensors and run modules-update:\n\n";
+   print "#----cut here----\n".
+         $configfile.
+         "#----cut here----\n\n";
+@@ -5728,22 +5734,33 @@
+         "should try these commands right now to make sure everything is\n".
+         "working properly. Monitoring programs won't work until the needed\n".
+         "modules are loaded.\n\n";
+-  
+-  my $have_sysconfig = -d '/etc/sysconfig';
+-  printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
+-         (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
+-         ($have_sysconfig ? 'YES/no' : 'yes/NO');
+-  $_ = <STDIN>;
+-  if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
+-    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/lm_sensors - Defines modules loaded by
+-#                                /etc/init.d/lm_sensors
++
++  print "To load everything that is needed, execute the commands below...";
++
++  print "\n\n#----cut here----\n";
++  print $modprobes;
++  print "# sleep 2 # optional\n",
++        "/usr/bin/sensors -s # recommended\n";
++  print "#----end cut here----\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
+@@ -5771,12 +5788,21 @@
+ # 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";
+     my @modules = grep /^modprobe /, split "\n", $modprobes;
++    print SYSCONFIG
++		  "# Load modules at startup\n".
++		  "LOADMODULES=yes\n\n".
++		  "# Initialize sensors at startup\n".
++		  "INITSENSORS=yes\n\n";
+     my $i = 0;
+     my $sysconfig = "";
+     foreach (@modules) {
+@@ -5785,10 +5811,8 @@
+       $i++;
+     }
+     print SYSCONFIG $sysconfig;
++    print "Done.\n";
+ 
+-    print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
+-          "for initialization at boot time.\n"
+-      unless -f "/etc/init.d/lm_sensors";
+   }
+ }
+ 
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
new file mode 100644
index 000000000000..24ee39c92baa
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2007 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.4.ebuild,v 1.1 2007/07/30 23:12:24 genstef 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="~alpha ~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 >=sys-kernel/vserver-sources-2.0 ) )
+		x86? ( || ( >=virtual/linux-sources-2.5 >=sys-kernel/vserver-sources-2.0 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl
+		>=x11-misc/read-edid-1.4.1-r1"
+
+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
+			ewarn
+			ewarn "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels for most sensors."
+			ewarn
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.10.4-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}"/lm_sensors-init.d lm_sensors
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord-conf.d sensord
+		newinitd "${FILESDIR}"/sensord-init.d sensord
+	fi
+
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+		README* TODO
+
+	dodoc 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 "Please run \`/usr/sbin/sensors-detect' in order to setup"
+	einfo "/etc/conf.d/lm_sensors."
+	einfo
+	einfo "/etc/conf.d/lm_sensors is vital to the init-script."
+	einfo "Please make sure you also add lm_sensors to the desired"
+	einfo "runlevel. Otherwise your I2C modules won't get loaded"
+	einfo "on the next startup."
+	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 refer to the lm_sensors documentation for more information."
+	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
+	einfo
+}