summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-11-18 11:34:50 +0000
committerPacho Ramos <pacho@gentoo.org>2012-11-18 11:34:50 +0000
commitde3eedb6d127f55a9001f96148fe837efc7c2aeb (patch)
treea4c1868f299e7101f862b06001d4c94b9c1c5802 /sys-apps
parentDrop duplication of myself as a maintainer where there is a herd. (diff)
downloadgentoo-2-de3eedb6d127f55a9001f96148fe837efc7c2aeb.tar.gz
gentoo-2-de3eedb6d127f55a9001f96148fe837efc7c2aeb.tar.bz2
gentoo-2-de3eedb6d127f55a9001f96148fe837efc7c2aeb.zip
Drop mobile herd as talked in gentoo-dev ML
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/lm_sensors/ChangeLog8
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch115
-rw-r--r--sys-apps/lm_sensors/lm_sensors-3.2.0.ebuild93
-rw-r--r--sys-apps/lm_sensors/lm_sensors-3.3.0.ebuild100
-rw-r--r--sys-apps/lm_sensors/metadata.xml2
5 files changed, 7 insertions, 311 deletions
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index bbefcdb2fa6f..cc79ef66ea8d 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/lm_sensors
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.128 2012/10/18 18:58:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.129 2012/11/18 11:34:49 pacho Exp $
+
+ 18 Nov 2012; Pacho Ramos <pacho@gentoo.org>
+ -files/lm_sensors-3.1.2-sensors-detect-gentoo.patch, -lm_sensors-3.2.0.ebuild,
+ -lm_sensors-3.3.0.ebuild, metadata.xml:
+ Drop mobile herd as talked in gentoo-dev ML
18 Oct 2012; Markus Meier <maekke@gentoo.org> lm_sensors-3.3.1.ebuild:
add ~arm, bug #438642
@@ -394,4 +399,3 @@
+lm_sensors-2.10.0.ebuild:
Version bump. Includes fancontrol init script based on the work of Micha
Pytasz, bug #98753.
-
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch
deleted file mode 100644
index 3657e12df6a4..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur lm_sensors-3.1.2.orig/prog/detect/sensors-detect lm_sensors-3.1.2/prog/detect/sensors-detect
---- lm_sensors-3.1.2.orig/prog/detect/sensors-detect 2010-02-15 10:34:26.000000000 +0100
-+++ lm_sensors-3.1.2/prog/detect/sensors-detect 2010-02-15 10:38:14.000000000 +0100
-@@ -20,6 +20,9 @@
- # MA 02110-1301 USA.
- #
-
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
-
- use strict;
-@@ -5687,26 +5690,33 @@
- print MODPROBE_D $configfile;
- close(MODPROBE_D);
- } else {
-+ 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".
-- "/etc/modprobe.conf:\n\n";
-+ "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- print "#----cut here----\n".
- $configfile.
- "#----cut here----\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 ($!)";
-+ 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(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(SYSCONFIG, ">".$filename)
-+ or die "Sorry, can't create $filename ($!).";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -5717,6 +5727,11 @@
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
-
- EOT
-+ print SYSCONFIG
-+ "# Load modules at startup\n".
-+ "LOADMODULES=yes\n\n".
-+ "# Initialize sensors at startup\n".
-+ "INITSENSORS=yes\n\n";
- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- if @{$bus_modules};
- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
-@@ -5725,6 +5740,10 @@
-
- # For compatibility reasons, modules are also listed individually as variables
- # 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.
-+#
- # You should use BUS_MODULES and HWMON_MODULES instead if possible.
-
- EOT
-@@ -5734,10 +5753,7 @@
- $i++;
- }
- close(SYSCONFIG);
--
-- 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";
-+ print "Done.\n";
-
- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -5751,20 +5767,6 @@
- "kernel modules.\n\n";
- }
- } else {
-- print "To load everything that is needed, add this to one of the system\n".
-- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-- print "#----cut here----\n";
-- if (@{$bus_modules}) {
-- print "# Adapter drivers\n";
-- print "modprobe $_\n" foreach (@{$bus_modules});
-- }
-- print "# Chip drivers\n";
-- print "modprobe $_\n" foreach (@{$hwmon_modules});
-- print((-e '/usr/bin/sensors' ?
-- "/usr/bin/sensors -s\n" :
-- "/usr/local/bin/sensors -s\n").
-- "#----cut here----\n\n");
--
- print "If you have some drivers built into your kernel, the list above will\n".
- "contain too many modules. Skip the appropriate ones! You really\n".
- "should try these commands right now to make sure everything is\n".
diff --git a/sys-apps/lm_sensors/lm_sensors-3.2.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.2.0.ebuild
deleted file mode 100644
index 37dd39da44ac..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.2.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.2.0.ebuild,v 1.7 2011/03/25 19:09:13 xarthisius Exp $
-
-EAPI=2
-inherit eutils 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.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86"
-IUSE="sensord"
-
-DEPEND="sys-apps/sed
- sensord? ( net-analyzer/rrdtool )"
-RDEPEND="dev-lang/perl
- virtual/logger"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.2-sensors-detect-gentoo.patch
-
- if use sensord; then
- sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die
- fi
-
- # Respect LDFLAGS
- sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-}
-
-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)" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
- install || die
-
- newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors || die
- newinitd "${FILESDIR}"/fancontrol-init.d fancontrol || die
-
- if use sensord; then
- newconfd "${FILESDIR}"/sensord-conf.d sensord || die
- newinitd "${FILESDIR}"/sensord-3-init.d sensord || die
- fi
-
- dodoc CHANGES CONTRIBUTORS INSTALL README \
- doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
-
- docinto chips
- dodoc doc/chips/*
-
- docinto developers
- dodoc doc/developers/applications
-}
-
-pkg_postinst() {
- elog
- elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
- elog "/etc/conf.d/lm_sensors."
- elog
- elog "/etc/conf.d/lm_sensors is vital to the init-script."
- elog "Please make sure you also add lm_sensors to the desired"
- elog "runlevel. Otherwise your I2C modules won't get loaded"
- elog "on the next startup."
- elog
- elog "You will also need to run the above command if you're upgrading from"
- elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has"
- elog "changed."
- elog
- elog "Be warned, the probing of hardware in your system performed by"
- elog "sensors-detect could freeze your system. Also make sure you read"
- elog "the documentation before running lm_sensors on IBM ThinkPads."
- elog
- elog "Also make sure you have read:"
- elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
- elog
- elog "Please refer to the lm_sensors documentation for more information."
- elog "(http://www.lm-sensors.org/wiki/Documentation)"
- elog
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.0.ebuild
deleted file mode 100644
index 92adc5b7b6ee..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.3.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.0.ebuild,v 1.5 2011/07/29 07:56:46 zmedico Exp $
-
-EAPI=3
-inherit eutils 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.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-linux"
-IUSE="sensord"
-
-RDEPEND="dev-lang/perl
- virtual/logger"
-DEPEND="sys-apps/sed
- sys-devel/bison
- sys-devel/flex
- sensord? ( net-analyzer/rrdtool )"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.2-sensors-detect-gentoo.patch
-
- if use sensord; then
- sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die
- fi
-
- # Respect LDFLAGS
- sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-}
-
-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)" || die
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- MANDIR="${EPREFIX}/usr/share/man" \
- ETCDIR="${EPREFIX}/etc" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- install || die
-
- newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors || die
- newinitd "${FILESDIR}"/fancontrol-init.d fancontrol || die
-
- if use sensord; then
- newconfd "${FILESDIR}"/sensord-conf.d sensord || die
- newinitd "${FILESDIR}"/sensord-3-init.d sensord || die
- fi
-
- dodoc CHANGES CONTRIBUTORS INSTALL README \
- doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
-
- docinto chips
- dodoc doc/chips/*
-
- docinto developers
- dodoc doc/developers/applications
-}
-
-pkg_postinst() {
- elog
- elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
- elog "/etc/conf.d/lm_sensors."
- elog
- elog "/etc/conf.d/lm_sensors is vital to the init-script."
- elog "Please make sure you also add lm_sensors to the desired"
- elog "runlevel. Otherwise your I2C modules won't get loaded"
- elog "on the next startup."
- elog
- elog "You will also need to run the above command if you're upgrading from"
- elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has"
- elog "changed."
- elog
- elog "Be warned, the probing of hardware in your system performed by"
- elog "sensors-detect could freeze your system. Also make sure you read"
- elog "the documentation before running lm_sensors on IBM ThinkPads."
- elog
- elog "Also make sure you have read:"
- elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
- elog
- elog "Please refer to the lm_sensors documentation for more information."
- elog "(http://www.lm-sensors.org/wiki/Documentation)"
- elog
-}
diff --git a/sys-apps/lm_sensors/metadata.xml b/sys-apps/lm_sensors/metadata.xml
index 329040714eea..3a17777a802c 100644
--- a/sys-apps/lm_sensors/metadata.xml
+++ b/sys-apps/lm_sensors/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mobile</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
<use>
<flag name='sensord'>Enable sensord - a daemon that can be used to
periodically log sensor readings from hardware health-monitoring