Display info about the gentoo HDD database in the ebuild. Make update-hddtemp.db...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 14aa5f7e444d958ab87d8f16122e3b5d34b4936d..bb0111bdd1c83cece4ac6fe6a4f011763573b713 100644 (file)
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.86 2010/06/23 22:23:15 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.87 2010/07/05 13:17:20 spock Exp $
+
+  05 Jul 2010; Michał Januszewski <spock@gentoo.org>
+  hddtemp-0.3_beta15-r4.ebuild, files/update-hddtemp.db:
+  Display info about the gentoo HDD database in the ebuild. Make
+  update-hddtemp.db try to fetch the latest version of the Gentoo database
+  from the web. Thanks to Peter Gantner for these useful suggestions (bug
+  #324563).
 
   23 Jun 2010; <spock@gentoo.org> files/hddgentoo.db:
   Add two additional hdd DB entries from bug #324213.

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index cd796328c40ed99d45ea5ea9585836988aa57d7c..9ef9dd87f5bf7d0b4e6b71c2c0a4fa51e3b2ce7c 100644 (file)
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -9,17 +9,17 @@ AUX hddtemp-0.3_beta15-nls.patch 414 RMD160 85adfd2f30ddeed6ab147cc9f3e1c02bc5c1
 AUX hddtemp-0.3_beta15-satacmds.patch 986 RMD160 445eb1a1c77738b0d62595a15955708c93310b16 SHA1 c81c89d0c8770aae5f667b5416e22c75518d122b SHA256 f3ae8ebd08d598cf9292d08e5fe07f54f894da7a90f02dcc9c46bb8d37afde56
 AUX hddtemp-conf.d 410 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 SHA1 3a642df90eb05bbd4524b622c58ce35b5f4dd4e8 SHA256 4b7b6793edbe54669965bf49dac95b273f128481aabe4b2b9e6c263f0e0a9ff5
 AUX hddtemp-init 547 RMD160 7387fd49f4f525ea82895c7fa1429a635abf7ace SHA1 f441e83730105a47055d7a78785ad126bd4e3745 SHA256 bf1253682d16fc54808451925bd001afe83a0dc3926a2250e00f986bf1a29f06
-AUX update-hddtemp.db 540 RMD160 c4fba8e0b6762ac580f30c2aeb3a5889d141a841 SHA1 7f9bea4a5d7faeac5bec7f9dbebab13cea078bf4 SHA256 a9bb0f2f8d1e72732357c73c4072f9420538c25df1e6657964f8fd8eeb6bc5c2
+AUX update-hddtemp.db 827 RMD160 16ec8df20d3d9a88327fa0e5c5b7bc1b9f1fe787 SHA1 688ba8d088b8544a5667d257dd91b18aeb384217 SHA256 696bfaae093464f8b6c65254c3eb086d0113f728f3eaeadf4a6247630742f761
 DIST hddtemp-0.3-beta15.tar.bz2 256372 RMD160 82b6affbbb14d23b5a8f3fecf3fff7acc0bd9def SHA1 65393b0a4d9862c030c81702d95c1acd00da275b SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
 DIST hddtemp-20080531.db.bz2 5627 RMD160 42b4bbb04dcecaf65d9cd34eba650161a7fd45b8 SHA1 8091b4aa0dd814ffe2847383ae49b7e39c7326f3 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd
 EBUILD hddtemp-0.3_beta15-r3.ebuild 2159 RMD160 eebfd6e2d03bfa0261c21c989ed07ad03a853b2f SHA1 1b22087d1837502143e9e6cb2647c5130d40c256 SHA256 a9c5bb67332862cc46e4b450878d686376e26367e1392f0994f49a45dbc1c468
-EBUILD hddtemp-0.3_beta15-r4.ebuild 2185 RMD160 a4e1ca9733dbb916a04b720674150f61e4be3593 SHA1 742d3fbe1019e90d4984bc6554ae9f9a80fa298c SHA256 a07ae688be71c57cd394529782d494c0f2c641848d6cf053abdb055e8cb4a253
-MISC ChangeLog 13643 RMD160 a8e6b5bdd49eecea8af8fd83544fa107633a7c05 SHA1 d36a638a286a80e6576f6ef6b7e2f5c3bf1e7f54 SHA256 4688fd00f4c3447e711a8dcdcf5331801bfa55351bd24d9436fece8793109e49
+EBUILD hddtemp-0.3_beta15-r4.ebuild 2393 RMD160 82a8711eea8a40eff5084dddfa2c5c94e6f8502d SHA1 75e2880473107180e324491cba88a5cbcdbcf1e2 SHA256 85442a61e7e27c30b22659e458de754e9b5acae9f331488ffe076103317eac95
+MISC ChangeLog 13981 RMD160 a702a77f9953c2f0154bd5ce7990f86921b3c3ca SHA1 00d133a82a07de6cbc964fcb9399c9bf3b927b35 SHA256 6ed0648a2f1f57e4df1c5025837438d1d6b8104e06c7ad33463554acf57e9ac9
 MISC metadata.xml 310 RMD160 f39a7464f5cbe15490a4e6868d1fbfd3d168c361 SHA1 e0baa9db48f51a55c64a692206b37ab21f63f8a5 SHA256 a850370c8d6b3dc1717db3baa1d7c3b36630dca172f9f27b7967e0f03b416855
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwiiWUACgkQchej4aZK9/f26ACeOAStIGwuLShewE2CKbThS6fN
-t9sAnio4N2nN3+xbRu21C+Vaj/Bdnab8
-=UryY
+iEYEARECAAYFAkwx228ACgkQchej4aZK9/dkeQCeNtQGSzKQd1YVMFD4/4v5YCV/
+sycAn0VxM4MA9+fGXiNOlBPz/6SIIQdO
+=x+Lw
 -----END PGP SIGNATURE-----

diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
index 5e82942eb3279042cae35e58157d0d51eab06c79..0a8c665b8794e0dc414da69c98e347b5b05faa5b 100755 (executable)
--- a/app-admin/hddtemp/files/update-hddtemp.db
+++ b/app-admin/hddtemp/files/update-hddtemp.db
@@ -22,5 +22,12 @@ die() {
 
 cd /usr/share/hddtemp
 wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db -q || die "Failed to download new hddtemp.db file"
+
+# Try to get the Gentoo HDD DB from WebCVS.  If that fails, just use the Gentoo HDD database
+# that was installed by the ebuild.
+if wget http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-admin/hddtemp/files/hddgentoo.db -O hddtmp.db -q; then
+       mv -f hddtmp.db hddgentoo.db
+fi
+
 update_db "hddgentoo.db" "hddtemp.db"
 

diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
index 8b9f0d285783380e221604a5aaaa1b40da021693..ee1395a4573ee4d2056576b53cd4e9e06c8782e6 100644 (file)
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild,v 1.1 2009/07/03 19:24:29 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild,v 1.2 2010/07/05 13:17:20 spock Exp $
 
 inherit eutils autotools
 
@@ -66,6 +66,9 @@ src_install() {
 pkg_postinst() {
        einfo "In order to update your hddtemp database, run:"
        einfo "  update-hddtemp.db"
+       einfo "If your hard drive is not recognized by hddtemp, please consider"
+       einfo "submitting your HDD info for inclusion into the Gentoo hddtemp"
+       einfo "database by filing a bug at https://bugs.gentoo.org/"
 }
 
 update_db() {