Updating the lm_sensors-2.10.1 ebuild, adding pkg_config, changing the postinst messa...

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 5fb64c36e956834d2963270999598e590a341ee7..3926ed0614b84ddc10bb7fa85d425f1e20f5564a 100644 (file)
--- 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.59 2007/01/09 21:32:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.60 2007/01/14 20:17:37 phreak Exp $
+
+  14 Jan 2007; Christian Heim <phreak@gentoo.org>
+  files/lm_sensors-2.10.1-sensors-detect-gentoo.patch,
+  lm_sensors-2.10.1.ebuild:
+  Updating the lm_sensors-2.10.1 ebuild, adding pkg_config, changing the
+  postinst message. Also adding the lm_sensors-detect patch supplied by
+  d[r]eadlock <m.dreadlock at gmail.com> in #157085.
 
   09 Jan 2007; Christian Heim <phreak@gentoo.org> lm_sensors-2.9.2.ebuild,
   lm_sensors-2.9.2-r2.ebuild, lm_sensors-2.10.0.ebuild,

diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 1364491ddead8cfd4679f2f18dc4a6160fe797c2..1f1d912fdae90601d0a30607fd08aaa3a5164a99 100644 (file)
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -37,10 +37,10 @@ AUX lm_sensors-2.10.1-sensord-init.d 726 RMD160 1220c22759467e9a7734aece6a98fe58
 MD5 9897fe2d9d4759a19e8a9402eb519e46 files/lm_sensors-2.10.1-sensord-init.d 726
 RMD160 1220c22759467e9a7734aece6a98fe588acc80f8 files/lm_sensors-2.10.1-sensord-init.d 726
 SHA256 5f3c023432ab593e696cee56d51d5d301ce0b5571a273ee6f34f6df88e713b5e files/lm_sensors-2.10.1-sensord-init.d 726
-AUX lm_sensors-2.10.1-sensors-detect-gentoo.patch 4749 RMD160 785711be4ef5921b02bb653f8263ce1c9f8a516e SHA1 41260bd88d9345a1e97c0dd2856fc651b7b9ff6f SHA256 123060dc48605cc938574c6ce249ce83dba0e19ba281daa7de49e8dfeaaf4611
-MD5 6686a17ea4def7b341e06f098c3e455d files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4749
-RMD160 785711be4ef5921b02bb653f8263ce1c9f8a516e files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4749
-SHA256 123060dc48605cc938574c6ce249ce83dba0e19ba281daa7de49e8dfeaaf4611 files/lm_sensors-2.10.1-sensors-detect-gentoo.patch 4749
+AUX lm_sensors-2.10.1-sensors-detect-gentoo.patch 4717 RMD160 366baff74ee7625eade5d66f794a764038f3f3ef SHA1 fec58ea73ea789a030ed60c918daaff374e19039 SHA256 22daf5740914cebe20f9d88e31d7b8ab9ca2bf6735c30bc1c12ba3aed9956f04
+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.9.2-lm_sensors-init.d 2453 RMD160 f3727abe9bc2604e27a0bc678ae0e63ec3c1ae24 SHA1 fb81472c63631e45101bf9eba8cbab06a2feddea SHA256 482188d6167c9da4bb86bc8fc014b64e5d7e90986cd79ece292fe307f4083bfe
 MD5 92e3fc99a32fb0b0a66786cd1b624167 files/lm_sensors-2.9.2-lm_sensors-init.d 2453
 RMD160 f3727abe9bc2604e27a0bc678ae0e63ec3c1ae24 files/lm_sensors-2.9.2-lm_sensors-init.d 2453
@@ -68,10 +68,10 @@ EBUILD lm_sensors-2.10.0.ebuild 4320 RMD160 0ee4da6d42c7648f64d93db433fae2982d20
 MD5 4d16a5a410a9917d37e1335407ae87c9 lm_sensors-2.10.0.ebuild 4320
 RMD160 0ee4da6d42c7648f64d93db433fae2982d202ec0 lm_sensors-2.10.0.ebuild 4320
 SHA256 65beb0b22299573ed968eb9b462aa93ad302595a640f48f710ea3730129e340d lm_sensors-2.10.0.ebuild 4320
-EBUILD lm_sensors-2.10.1.ebuild 4323 RMD160 8c81193e73c681f1c2cc71562403a75e98190791 SHA1 468d5b6e3876195b6b8abd41524f210c9292be0f SHA256 9aa2194a69bdefe176c4a1852d75b57f924fd87202f0b4f33a6e345ed7670933
-MD5 c20218d2b595bb6afb57088dc0071878 lm_sensors-2.10.1.ebuild 4323
-RMD160 8c81193e73c681f1c2cc71562403a75e98190791 lm_sensors-2.10.1.ebuild 4323
-SHA256 9aa2194a69bdefe176c4a1852d75b57f924fd87202f0b4f33a6e345ed7670933 lm_sensors-2.10.1.ebuild 4323
+EBUILD lm_sensors-2.10.1.ebuild 4485 RMD160 d3a98e6b2feba2b3f86dc776b59c69ebcab4f96d SHA1 33d7ab017fb16e5940cb3195e026a61a4545e7b0 SHA256 57fc7d1ab50c9b457032a9ceac212bb589a76de33e5bde5fea99c6cafed8b814
+MD5 a31d0de37a91ddb12f4b89c9583b9755 lm_sensors-2.10.1.ebuild 4485
+RMD160 d3a98e6b2feba2b3f86dc776b59c69ebcab4f96d lm_sensors-2.10.1.ebuild 4485
+SHA256 57fc7d1ab50c9b457032a9ceac212bb589a76de33e5bde5fea99c6cafed8b814 lm_sensors-2.10.1.ebuild 4485
 EBUILD lm_sensors-2.9.2-r2.ebuild 4257 RMD160 412b5fbaeb638ef2ac510787e47837301cd1c5f8 SHA1 c56bdb06f403cc81911e99da4e643b2de38bcf6a SHA256 bc828df6fe6f45c6d39e8f8421c0d52a90bdd277d594a87409a5cbbb1fdb21f0
 MD5 0e12003525de066ea6e9f95f9108db85 lm_sensors-2.9.2-r2.ebuild 4257
 RMD160 412b5fbaeb638ef2ac510787e47837301cd1c5f8 lm_sensors-2.9.2-r2.ebuild 4257
@@ -80,10 +80,10 @@ EBUILD lm_sensors-2.9.2.ebuild 4242 RMD160 69f3ae6bc3480a043438d6359e3ea3cfa4373
 MD5 1705d3dffd8187ecb325ff65a480b648 lm_sensors-2.9.2.ebuild 4242
 RMD160 69f3ae6bc3480a043438d6359e3ea3cfa43737bc lm_sensors-2.9.2.ebuild 4242
 SHA256 db0784b5694636b972e16e1b6c30111452f83d79394e38cabcd4c9ecbfa263ff lm_sensors-2.9.2.ebuild 4242
-MISC ChangeLog 3136 RMD160 d88e05d8f11f2ede7f00aca50acc60499395b50b SHA1 30f421deb1c8375d728796878368b234e1fa5236 SHA256 5541d8efaf1a16311f17de653c41cc458096895be3ce675aa4a60092e8fe1421
-MD5 70be489e5cc280b2060c7b01fe378c0c ChangeLog 3136
-RMD160 d88e05d8f11f2ede7f00aca50acc60499395b50b ChangeLog 3136
-SHA256 5541d8efaf1a16311f17de653c41cc458096895be3ce675aa4a60092e8fe1421 ChangeLog 3136
+MISC ChangeLog 3468 RMD160 36c4c7c5d9d1b04c74ef4f153fe76c8d1bca0db5 SHA1 3b4d489fc59dfc86659f1863d8818d7e54664505 SHA256 78b980d2f1ecd3596e266a24f56d9dab5d78a520d7d41ce3f67b468e7a996c82
+MD5 58893cee0d318058e5b9b35c0302056c ChangeLog 3468
+RMD160 36c4c7c5d9d1b04c74ef4f153fe76c8d1bca0db5 ChangeLog 3468
+SHA256 78b980d2f1ecd3596e266a24f56d9dab5d78a520d7d41ce3f67b468e7a996c82 ChangeLog 3468
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -106,7 +106,7 @@ SHA256 e5acc8f4b135fb18ef10fb67cf04b3aabcf000cd4358fa3cb3bd51ea743ee3a6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpAn6yuNVb5qfaOYRAoDKAKCNF3QnMUjtOuWd6MI8uuGZ/Ic1DgCgoXOt
-S917C6WzL7gfD1wqqsaj3m8=
-=7ckz
+iD8DBQFFqp3zyuNVb5qfaOYRAnYdAJ0XvbbrjX7OwKCBZn24jk617QclNACgpQa3
+ZHBUetjC2A7ZRDUY918aOiw=
+=2c3y
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
index d75c36063691ee53c5adf9737845b0b14d4168d7..748c56a31cac4f5455557682f2e17ee0256694ae 100644 (file)
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensors-detect-gentoo.patch
@@ -84,7 +84,7 @@ Index: lm_sensors-2.10.1/prog/detect/sensors-detect
  #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
  #
  #    This program is free software; you can redistribute it and/or modify
-@@ -5481,13 +5491,22 @@ sub main
+@@ -5481,12 +5491,21 @@ sub main
  # in order as normal variables with the special names:
  #    MODULE_0, MODULE_1, MODULE_2, etc.
  #
@@ -97,18 +97,16 @@ Index: lm_sensors-2.10.1/prog/detect/sensors-detect
  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;
--    my $i = 0;
-+        "# 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 $i = 0;
+     my $i = 0;
      my $sysconfig = "";
      foreach (@modules) {
-       s/^modprobe //;
 @@ -5495,10 +5514,8 @@ EOT
        $i++;
      }

diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
index eb021b99d7716b7e15472d380977e560f6e7fbc1..3f0aad436ac7c2cded95f8709c9708ee273c15ef 100644 (file)
--- a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2007/01/09 21:32:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild,v 1.3 2007/01/14 20:17:37 phreak Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -71,7 +71,7 @@ src_unpack() {
        unpack ${A}
 
        cd "${S}"
-       epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
+       epatch "${FILESDIR}/${P}-sensors-detect-gentoo.patch"
 
        if use sensord; then
                sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
@@ -105,7 +105,7 @@ src_install() {
        dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
                README* TODO
 
-       dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+       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
@@ -124,10 +124,13 @@ src_install() {
 
 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 "Please run \`emerge --config =${P}' 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"
@@ -142,4 +145,8 @@ pkg_postinst() {
        einfo
 }
 
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).
+pkg_config() {
+       ebegin "Executing /usr/sbin/sensors-detect"
+       ${ROOT}usr/sbin/sensors-detect
+       eend $?
+}