summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-25 20:54:46 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-25 20:54:46 +0000
commitbf0bbe4b608c21474f2750c57e60df3212ad9483 (patch)
tree139f4c48d6094bb45caa4954c8e5101a91b34a55
parentMask sci-libs/libgeda for removal (diff)
downloadhistorical-bf0bbe4b608c21474f2750c57e60df3212ad9483.tar.gz
historical-bf0bbe4b608c21474f2750c57e60df3212ad9483.tar.bz2
historical-bf0bbe4b608c21474f2750c57e60df3212ad9483.zip
old
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
-rw-r--r--sys-apps/lm_sensors/Manifest16
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch61
-rw-r--r--sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild98
-rw-r--r--sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild97
4 files changed, 0 insertions, 272 deletions
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 7813b05fd5cd..a4a962cff41b 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -1,25 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
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-changeset_r5835.patch 1486 RMD160 ae5d8141d157a41b11fe212bf7a9a1d797a8039e SHA1 81297fbf114000935dce0c71578636d58522b1fb SHA256 daf1f6cdc96abf7139a73be1e230dfa221c4da5f1a31251da5bbea4d4e08453a
AUX lm_sensors-3.1.2-sensors-detect-gentoo.patch 4502 RMD160 8d5f528e654ee8422de3d4190531b22a841d7acf SHA1 9b21848fc22866721ca6e9fed4b9039abe954a82 SHA256 c9686202da0529e695c3ea872961870884c0474526fee3e3053f3e5d3bd0949e
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.1.2.tar.bz2 157644 RMD160 161e626bf401cd0213c821c95b32248e0bd6a1f5 SHA1 4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7 SHA256 a4f9553417f4c6592e87cbcbefb04d5c16710d58fa6fd02ca46a309f3b613d6e
DIST lm_sensors-3.2.0.tar.bz2 165008 RMD160 bdb216b6c1b5f553f932785d1350b0cac61e3446 SHA1 9c9ac470289e831076da52d644185b34058a457d SHA256 bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581
-EBUILD lm_sensors-3.1.2-r1.ebuild 3071 RMD160 52f4da2e3d0c3f3aa6d1fa6e70002ce32e8e8ca2 SHA1 4004eeb56edbea518a84d1d5ecec559f3ed53458 SHA256 9d2947f3ecd6e56f6821d8fcd7871f4f1c19e077f8fb95539ac0361904e6f1e9
-EBUILD lm_sensors-3.1.2.ebuild 3017 RMD160 7ad94fac6f7c8e5083bfc9774c4cd7ad193b9bf7 SHA1 4ed5a7cdc593a919c067e2fbf449406bd51b9895 SHA256 666e3778052def5ee7915c5a5e6ef0189fd62b4f872939cfe9fc4a0cc03519d7
EBUILD lm_sensors-3.2.0.ebuild 2969 RMD160 f16a9b393e22949be029675d6bbabc4e4b16f983 SHA1 ff6ff4748b7f04970dc7e84d628d0ec1a1a4bad9 SHA256 1438cbda3e6cd1918d469e6fa59110514748b8c9b10bc0500451af32f907a883
MISC ChangeLog 13275 RMD160 f5fa73002c6102f418947956bc715620a715483b SHA1 592d212ea300baadbe65cf4e6350e613b515219f SHA256 0fe4be7d0980ee56f53115be7b334c8d3b12e2090a32f91d33360e05df050f14
MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk2M6GIACgkQIiMqcbOVdxS8vAP+JudboegCDlEDcTprzkvm+p5z
-wchlKLApKPZWNActmjjV9D4gPUfekJXxyNXHCl68d1FOFbDbP3XrtCZAB1dBNmtz
-ULfFgFTNuZ7SlfdHXhTAc9pLFUrmeZ5y8O036Y8OC49fEfNvCL5MPJfb8onNMi4w
-7ZCpgewgZpf5QVnjl2Y=
-=fYWp
------END PGP SIGNATURE-----
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
deleted file mode 100644
index d0fb9c15ddcf..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- prog/sensord/rrd.c
-+++ prog/sensord/rrd.c
-@@ -137,9 +137,11 @@
- }
- }
-
-+/* Returns the number of features processed, or -1 on error */
- static int _applyToFeatures(FeatureFN fn, void *data,
- const sensors_chip_name *chip,
-- const ChipDescriptor *desc)
-+ const ChipDescriptor *desc,
-+ int labelOffset)
- {
- int i;
- const FeatureDescriptor *features = desc->features;
-@@ -147,7 +149,7 @@
- const char *rawLabel;
- char *label;
-
-- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
-+ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
- feature = features + i;
- rawLabel = feature->feature->name;
-
-@@ -158,11 +160,11 @@
- return -1;
- }
-
-- rrdCheckLabel(rawLabel, i);
-- fn(data, rrdLabels[i], label, feature);
-+ rrdCheckLabel(rawLabel, labelOffset + i);
-+ fn(data, rrdLabels[labelOffset + i], label, feature);
- free(label);
- }
-- return 0;
-+ return i;
- }
-
- static ChipDescriptor *lookup_known_chips(const sensors_chip_name *chip)
-@@ -184,7 +186,7 @@
-
- static int applyToFeatures(FeatureFN fn, void *data)
- {
-- int i, i_detected, ret;
-+ int i, i_detected, ret, labelOffset = 0;
- const sensors_chip_name *chip, *chip_arg;
- ChipDescriptor *desc;
-
-@@ -197,9 +199,10 @@
- if (!desc)
- continue;
-
-- ret = _applyToFeatures(fn, data, chip, desc);
-- if (ret)
-+ ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
-+ if (ret < 0)
- return ret;
-+ labelOffset += ret;
- }
- }
- return 0;
diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild
deleted file mode 100644
index 02efafb02e07..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 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.1.2-r1.ebuild,v 1.1 2010/06/27 18:48:45 ssuominen Exp $
-
-EAPI="2"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~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}"/${P}-sensors-detect-gentoo.patch \
- "${FILESDIR}"/${P}-changeset_r5835.patch
-
- if use sensord; then
- sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' "${S}"/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 "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
- install || die "emake install failed"
-
- 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*
-
- dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
- doc/progs doc/temperature-sensors doc/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.1.2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild
deleted file mode 100644
index 0c525f4a19bd..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 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.1.2.ebuild,v 1.6 2010/06/27 17:44:25 armin76 Exp $
-
-EAPI="2"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 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}"/${P}-sensors-detect-gentoo.patch
-
- if use sensord; then
- sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' "${S}"/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 "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
- install || die "emake install failed"
-
- 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*
-
- dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
- doc/progs doc/temperature-sensors doc/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
-}