From fc1654d994f7bf928cb3362290a95fe618fc83e2 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 30 Sep 2011 19:58:10 +0000 Subject: Version bump (bug #377223) Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64 --- sys-apps/lm_sensors/ChangeLog | 8 +- sys-apps/lm_sensors/Manifest | 25 +++- .../lm_sensors-3.3.1-sensors-detect-gentoo.patch | 129 +++++++++++++++++++++ sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild | 100 ++++++++++++++++ 4 files changed, 255 insertions(+), 7 deletions(-) create mode 100644 sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch create mode 100644 sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog index 3c5f7c302447..7ec257b9cfd3 100644 --- a/sys-apps/lm_sensors/ChangeLog +++ b/sys-apps/lm_sensors/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/lm_sensors # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.118 2011/07/29 07:56:46 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.119 2011/09/30 19:58:10 polynomial-c Exp $ + +*lm_sensors-3.3.1 (30 Sep 2011) + + 30 Sep 2011; Lars Wendler +lm_sensors-3.3.1.ebuild, + +files/lm_sensors-3.3.1-sensors-detect-gentoo.patch: + non-maintainer commit: Version bump (bug #377223). 29 Jul 2011; Zac Medico lm_sensors-3.3.0.ebuild: Add ~x86-linux keyword. diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest index 1ce01d324339..76241f797513 100644 --- a/sys-apps/lm_sensors/Manifest +++ b/sys-apps/lm_sensors/Manifest @@ -1,21 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 aabcdaf530f6d49f3de01e9b6d78470c6538ff38 SHA256 b231b76d5b32bb303a8e42727f48a4405cec71eedfe392e837acba5e46532783 AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3 AUX lm_sensors-3.1.2-sensors-detect-gentoo.patch 4502 RMD160 8d5f528e654ee8422de3d4190531b22a841d7acf SHA1 9b21848fc22866721ca6e9fed4b9039abe954a82 SHA256 c9686202da0529e695c3ea872961870884c0474526fee3e3053f3e5d3bd0949e +AUX lm_sensors-3.3.1-sensors-detect-gentoo.patch 4906 RMD160 d75ffb924028f3537b242fcf5c67e4976853fd0b SHA1 efe917720226e629b590d53e6b722c4ab8eeb479 SHA256 39f8674e526aa837493a5009b7465f7c8f04784c5990de8a6b8c885c5d8b44a7 AUX sensord-3-init.d 712 RMD160 7f5be22a8e1e0b7adb56d4ba74e685eb3789cbf2 SHA1 05f4ed45896e708accab73057719ec866e9351af SHA256 8a3debf0b84af9944a467e377b0e4b0db67d428083675f0fcf33ec55a8b2a709 AUX sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 43090c58c918969caa359d3b6e89237585759f46 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d DIST lm_sensors-3.2.0.tar.bz2 165008 RMD160 bdb216b6c1b5f553f932785d1350b0cac61e3446 SHA1 9c9ac470289e831076da52d644185b34058a457d SHA256 bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581 DIST lm_sensors-3.3.0.tar.bz2 169020 RMD160 3cf7bb16d05c8d3f99ddb144995f5e8dc2e84041 SHA1 16c13a186557164fa51459a02209b120c0335f96 SHA256 145c222e4611cedb2d16efb2700164f599297b2124c4dc30af4fc89c417cc20f +DIST lm_sensors-3.3.1.tar.bz2 170156 RMD160 fc6ebaeb91a588a199ca97c066d236f83b12f412 SHA1 cb819e5a93adb36ef00e6d3c5363f5f474efa78a SHA256 cfcc783945f7bfd5206e73f8f9d3f353b0dbf22153c0ef2587a8d7a7be7e628f EBUILD lm_sensors-3.2.0.ebuild 2969 RMD160 f16a9b393e22949be029675d6bbabc4e4b16f983 SHA1 ff6ff4748b7f04970dc7e84d628d0ec1a1a4bad9 SHA256 1438cbda3e6cd1918d469e6fa59110514748b8c9b10bc0500451af32f907a883 EBUILD lm_sensors-3.3.0.ebuild 3095 RMD160 6110b6fe07c728244738265719886272515596d6 SHA1 26e5c01d1fd6508efc40d491756cd604c704655f SHA256 79a9c0e713e13e6080b8d55f30462863a6a7350c8fa04e427c3aea5fd7df3e76 -MISC ChangeLog 13775 RMD160 5abcd95b5122b0797c38ca96fd428f7a756a72e4 SHA1 121d4d1165a07af9e9b3a3500f8316e4029f329a SHA256 db34654e0a424f538ce85a44bed1f23c12c0503ca16c02db82b7240f64a0de9f +EBUILD lm_sensors-3.3.1.ebuild 3100 RMD160 d8317b80284054a8d357fc87fb0d47cbc90255d6 SHA1 8f8cfac60f3e79d4eff64243fb95174ac82d2a27 SHA256 d755054e579b3327ba46fd6d47118604baa9d07fb4943b4f2927549af0f807be +MISC ChangeLog 14002 RMD160 11969f9fb0f2b929cc5076a505c95fc94bef8906 SHA1 03f1a3a09ea6896b15827d0fd616fe334b2f7dd1 SHA256 3e82d76779e6b8b7699e920d27dc46ae3fb170864b6994521ae5116db4f53745 MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4yZ8QACgkQ/ejvha5XGaN6yQCeJW0kPTAzIyhMSus3JH341/Qo -UOgAmgKtxw/IEMFIlwJZkQ6oKr3OesJC -=mmdy +iQIcBAEBCgAGBQJOhh9XAAoJEPiazRVxLXTFCs4QAME+gJLD/0PKlB2Tv/q+sYch +hDwF8WICetbtuHzTiNn+oKldQV7/94s6DkaIuT+97uNIJRL3rxejjz5iRVQ+THhD +WO1TmEvg6j0eDAh6Cl4g5/5d74rXjWxWQDiv0FcFflz3yjZr5IHKEJPnwPVDqtO9 +o9OqoZvuqqILpmlS5Ke6veRm4J2InnRKppUP68PoqUj1yt98nI+6OmvAdzrn1Bel +o+nixE6M8JdY5RLBg2VasWIdsmCIy3QFbOn1JcG8IHEobFxfpAgxfrflxuTRzxOx +Q/hkRzERDIaYCZACh6EmaiLKDXhsvdwlTtAdrV04gAW02uavQ745JlLaypFmfUf/ ++pJAPCzP2+6M9cB1+grCorMMUTBGlsndZMbbxHPMCzsZ6vgj8pM0XI4QdlsDA+jV +zSxucKYTucf2urx/zqiu1PkWWYyApFfYA+QJ0p7HQbuJ5Jf3BHvleQgszC4C6t6V +tEUz14QgM7ABTy2iZ4E0/k8mWswIBvKw5pMVrn3/nLmozsluJKYGXg7KOqRSByFc +yxTKr5nGL8Vb0nwj1GnBweCZqniAnhTpioPThuHTQeXhmFh3A4EDCKKutLAvLOYK +SW7E1hipjmBphI5VgqHDbzg/5e1CJSgvnWDeUcBHYOcNQjylPKG1uOlTKoTaryc+ +66N78omaMuys62XJwmo3 +=qjdm -----END PGP SIGNATURE----- diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch new file mode 100644 index 000000000000..58772f215614 --- /dev/null +++ b/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch @@ -0,0 +1,129 @@ +--- lm_sensors-3.3.1/prog/detect/sensors-detect ++++ lm_sensors-3.3.1/prog/detect/sensors-detect +@@ -20,6 +20,9 @@ + # MA 02110-1301 USA. + # + ++# Gentoo specific modifications based on a patch from Rudo Thomas ++# ++ + require 5.004; + + use strict; +@@ -6471,26 +6474,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'); +- $_ = ; +- 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 = ; ++ ++ 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 = ; + } +- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") +- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; ++ open(local *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 +@@ -6501,6 +6511,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"; +@@ -6509,6 +6524,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 +@@ -6519,25 +6538,7 @@ + } + close(SYSCONFIG); + +- if (-x "/bin/systemctl" && -d "/lib/systemd/system" && +- ! -f "/lib/systemd/system/lm_sensors.service") { +- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n". +- "and run 'systemctl enable lm_sensors.service'\n". +- "for initialization at boot time.\n"; +- return; +- } +- +- if (-x "/bin/systemctl" && +- -f "/lib/systemd/system/lm_sensors.service") { +- system("/bin/systemctl", "enable", "lm_sensors.service"); +- system("/bin/systemctl", "start", "lm_sensors.service"); +- # All done, don't check for /etc/init.d/lm_sensors +- return; +- } +- +- 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"); +@@ -6551,20 +6552,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.3.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild new file mode 100644 index 000000000000..01da8a0b55c9 --- /dev/null +++ b/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild @@ -0,0 +1,100 @@ +# 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.1.ebuild,v 1.1 2011/09/30 19:58:10 polynomial-c 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.3.1-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 +} -- cgit v1.2.3-65-gdbad