*** empty log message ***

8 files changed, 283 insertions, 64 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index d0116fc2b163..3e51228a18f2 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,9 +1,131 @@
 # ChangeLog for app-admin/hddtemp
-# Copyright 2002 Imran Rafique; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.1 2002/06/22 06:05:31 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.1.1.1 2005/11/30 10:00:13 chriswhite Exp $
 
+  08 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  hddtemp-0.3_beta14.ebuild:
+  Removed explicit dependencies on libc and wget since these two are in the
+  system profile.
+
+*hddtemp-0.3_beta14 (06 Nov 2005)
+
+  06 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  -files/hddtemp-0.2-db_location.patch, -hddtemp-0.2.ebuild,
+  -hddtemp-0.3_beta8.ebuild, -hddtemp-0.3_beta10.ebuild,
+  -hddtemp-0.3_beta11.ebuild, -hddtemp-0.3_beta12.ebuild,
+  +hddtemp-0.3_beta14.ebuild:
+  Version bump (#111232). Removed old ebuilds.
+
+  19 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  hddtemp-0.3_beta13.ebuild:
+  Stable on amd64.
+
+  19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  hddtemp-0.3_beta13.ebuild:
+  Stable on sparc
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  hddtemp-0.3_beta13.ebuild:
+  Stable on ppc.
+
+  16 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  hddtemp-0.3_beta13.ebuild:
+  Marked 0.3_beta13 stable on x86.
+
+*hddtemp-0.3_beta13 (13 Jul 2005)
+
+  13 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  +files/hddtemp-0.3_beta13-setsid.patch, metadata.xml,
+  +hddtemp-0.3_beta13.ebuild:
+  Version bump. Closes bugs #86550 and #91972.
+
+  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  hddtemp-0.3_beta12.ebuild:
+  Stable on sparc
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> hddtemp-0.3_beta12.ebuild:
+  Changed -sparc keyword to ~sparc.
+
+*hddtemp-0.3_beta12 (25 Oct 2004)
+
+  25 Oct 2004; Lars Weiler <pylon@gentoo.org> +hddtemp-0.3_beta12.ebuild:
+  Version bump. At least on ppc this resolves problems with
+  >linux26-headers-2.6.8.
+
+  25 Oct 2004; Lars Weiler <pylon@gentoo.org> hddtemp-0.2.ebuild,
+  hddtemp-0.3_beta10.ebuild, hddtemp-0.3_beta11.ebuild,
+  hddtemp-0.3_beta8.ebuild:
+  Changed all appearances of http://coredump.free.fr to http://www.guzu.net
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> hddtemp-0.2.ebuild:
+  add sed-4 dep
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> hddtemp-0.2.ebuild:
+  Added IUSE=.
+
+  31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> hddtemp-0.3_beta11.ebuild:
+  Mark stable on x86, removing an old version.
+
+*hddtemp-0.3_beta11 (11 Feb 2004)
+
+  11 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> hddtemp-0.3_beta11.ebuild,
+  files/hddtemp-conf.d, files/hddtemp-init, files/hddtemp.db:
+  Version bump, added init script and conf.d script by Sam Wouters
+  <sam@ericom.be> in #36047. Also updated hddtemp.db
+
+  10 Jan 2004; Jason Wever <weeve@gentoo.org> hddtemp-0.3_beta10.ebuild:
+  Changed ~sparc keyword to -sparc as src/backtrace.c only works for x86 and
+  requires an include file not found on sparc.
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> hddtemp-0.2.ebuild,
+  hddtemp-0.3_beta10.ebuild, hddtemp-0.3_beta6-r1.ebuild,
+  hddtemp-0.3_beta6.ebuild, hddtemp-0.3_beta8.ebuild:
+  Marked 0.3_beta8 stable on sparc and updated copyright dates on all ebuilds.
+
+*hddtemp-0.3_beta10 (17 Dec 2003)
+
+  17 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> hddtemp-0.3_beta10.ebuild,
+  hddtemp-0.3_beta8.ebuild, files/hddtemp.db:
+  Version bump, keywords update and new hddtemp.db.
+
+  01 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> hddtemp-0.3_beta8.ebuild :
+  I was working on this update too, but Martin commited his bump before me. 
+  My new version uses the new configuration script and tries to download the latest hddtemp.db file.
+
+*hddtemp-0.3_beta8 (31 Aug 2003)
+
+  31 Aug 2003; Martin Holzer <mholzer@gentoo.org> hddtemp-0.3_beta8.ebuild:
+  Version bumped.
+
+*hddtemp-0.3_beta6-r1 (11 Jun 2003)
+
+  11 Jun 2003; Robin Johnson <robbat2@gentoo.org> hddtemp-0.3_beta6-r1.ebuild:
+  Changes to ebuild to make it easy to bump the version for getting the
+  database updates. One reason for just not updating the hddtemp.db in the
+  tree is that in some cases you might want to go back versions, and the
+  author is also considering changing the hddtemp.db file format.
+  Redo the concept of the hddtemp.db patch, using sed, so we can change the
+  location inside the ebuild. This is important as we want to be able to
+  easily update the file without worrying about CONFIG_PROTECT.
+
+*hddtemp-0.3_beta6 (15 Apr 2003)
+
+  09 May 2003; Martin Holzer <mholzer@gentoo.org> hddtemp-0.2.ebuild,
+  hddtemp-0.3_beta6.ebuild:
+  Updated Homepage. Closes #18742.
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  hddtemp-0.2.ebuild, hddtemp-0.3_beta6.ebuild, files/hddtemp.db:
+  Version bumped, moved hddtemp.db out of portage tree.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *hddtemp-0.2 (10 Jun 2002)
 
+  29 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> hddtemp-0.2.ebuild :
+
+  Added ppc to KEYWORDS.
+
   21 June 2002; George Shapovalov <george@gentoo.org> hddtemp-0.2.ebuild :
   
   cleaned up ebuild (removed non-standard USE flag and recommended better solution 
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 57c6670f49fe..4c8d1ffc2f56 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,6 +1,20 @@
-MD5 867cea4c38ba6438bf2b7483991f087d ChangeLog 1236
-MD5 0482992424f22c086720a8b51a9f37ad hddtemp-0.2.ebuild 933
-MD5 7e529b08b34e35c75af24a26010cd565 hddtemp-0.3_beta6.ebuild 908
-MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
-MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
-MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b563377cf7b1301fc1ec0fe443eddebd ChangeLog 5414
+MD5 d2b4b7b99f1a5c3a26d093cea53e85a0 files/digest-hddtemp-0.3_beta13 71
+MD5 4784b9ba9acebc638325e817d252b9b1 files/digest-hddtemp-0.3_beta14 71
+MD5 91e4b7762278d6c80f97ce6039442e8d files/hddtemp-0.3_beta13-setsid.patch 370
+MD5 92bf0d7e78de1bafcedee9c9042df8b2 files/hddtemp-conf.d 342
+MD5 52e2d71a98fe1eabc27e90f889796a6a files/hddtemp-init 538
+MD5 f816512c3feee3cc9a92a9a8d27e9cff files/hddtemp.db 11325
+MD5 18f827ae137a300c155ee91af047824d hddtemp-0.3_beta13.ebuild 1276
+MD5 13f53f00ca597daffc3378e38af2f03e hddtemp-0.3_beta14.ebuild 1213
+MD5 ac68604576ccfc58e653bc0982bef4d4 metadata.xml 281
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcOo9chej4aZK9/cRAkRTAJ933OIS491A2u4UD6Dgkv2ruibaegCgh5nT
+vWl7z9rC3a1MSvhKFOYLrYE=
+=PtTc
+-----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/hddtemp-conf.d b/app-admin/hddtemp/files/hddtemp-conf.d
index 7dbe81e7b545..71da926ab253 100644
--- a/app-admin/hddtemp/files/hddtemp-conf.d
+++ b/app-admin/hddtemp/files/hddtemp-conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-conf.d,v 1.1 2004/02/11 15:37:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-conf.d,v 1.1.1.1 2005/11/30 10:00:13 chriswhite Exp $
 
 # the hddtemp executable
 HDDTEMP_EXEC=/usr/sbin/hddtemp
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
index 7b0bda7a928f..868a21fd36ab 100644
--- a/app-admin/hddtemp/files/hddtemp-init
+++ b/app-admin/hddtemp/files/hddtemp-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-init,v 1.1 2004/02/11 15:37:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-init,v 1.1.1.1 2005/11/30 10:00:13 chriswhite Exp $
 
 depend() {
 	need localmount 
diff --git a/app-admin/hddtemp/files/hddtemp.db b/app-admin/hddtemp/files/hddtemp.db
index fbc41818d0a9..09ef9ca88dc3 100644
--- a/app-admin/hddtemp/files/hddtemp.db
+++ b/app-admin/hddtemp/files/hddtemp.db
@@ -1,5 +1,5 @@
 #
-# DATABASE VERSION 013 (06/06/2002)
+# DATABASE VERSION 03C (01/01/2004)
 #
 # Insert a regular expression for support of the model or the serie of your hard drive.
 # If you don't know what to put in the second field, put the number
@@ -7,37 +7,25 @@
 # A value of zero meens that we know that the drive doesn't have
 # a temperature sensor (you can set the unit to C or F).
 #
+############################################################################
 # The following list was found at (http://www.almico.com/sfhardware.php)
 # If your drive is in the list send me a mail.
 #
 # Manufacturer   Model   Size   Notes
-# FUJITSU FUJITSU MHN2300AT 29.3GB
 # FUJITSU FUJITSU MPF3102AH 10.0GB
-# FUJITSU FUJITSU MPG3204AH 20.0GB
 # FUJITSU FUJITSU MPG3204AH E 20.0GB
 # FUJITSU FUJITSU MPG3307AT 30.0GB
 # FUJITSU FUJITSU MPG3409AH 40.0GB
-# FUJITSU FUJITSU MPG3409AH E 40.0GB
 # FUJITSU FUJITSU MPG3409AH EF 40.0GB
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
 # HITACHI HITACHI_DK23CA-30 29.3GB
-# IBM IC25N015ATDA04-0 14.7GB
-# IBM IC25N030ATDA04-0 29.3GB
-# MAXTOR MAXTOR 4D080H4 80.0GB
 # MAXTOR MAXTOR 4K020H1 19.9GB
-# MAXTOR MAXTOR 6L020J1 20.1GB
-# MAXTOR MAXTOR 6L040J2 39.1GB
-# MAXTOR MAXTOR 6L040L2 39.1GB
-# MAXTOR MAXTOR 6L060J3 58.6GB
-# MAXTOR MAXTOR 6L060L3 58.6GB
-# MAXTOR MAXTOR 6L080J4 78.2GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
 # SEAGATE ST310215A 10.0GB
 # SEAGATE ST315320A 14.9GB
-# SEAGATE ST320011A 19.6GB
 # SEAGATE ST320410A 19.6GB
 # SEAGATE ST320413A 19.6GB
 # SEAGATE ST320420A 19.9GB
@@ -47,13 +35,10 @@
 # SEAGATE ST330630A 29.9GB
 # SEAGATE ST340016A 39.1GB
 # SEAGATE ST340810ACE 39.1GB
-# SEAGATE ST340823A 39.1GB
 # SEAGATE ST380020ACE 78.2GB
-# SEAGATE ST380020A 78.2GB
 # SEAGATE ST380021A 78.2GB
 # WESTERN DIGITAL WDC AC210200D 10.0GB
 # WESTERN DIGITAL WDC AC29100D 8.9GB
-# WESTERN DIGITAL WDC AC418000D 17.6GB
 # WESTERN DIGITAL WDC AC420400D 19.9GB
 # WESTERN DIGITAL WDC WD102AA 10.0GB
 #
@@ -63,13 +48,22 @@
 ########################################
 ############# Fujitsu drives
 ########################################
-
+"FUJITSU MHM2100AT"		0    C  "Fujitsu MHM2100AT"
 "FUJITSU MHN2200AT"		194  C  "Fujitsu MHN2200AT"
+"FUJITSU MHN2300AT"		194  C  "Fujitsu MHN2300AT"
+"FUJITSU MHR2020AT"		194  C  "Fujitsu MHR2020AT"
+"FUJITSU MHR2030AT"		194  C  "Fujitsu MHR2030AT"
+"FUJITSU MHS2030AT"		194  C  "Fujitsu MHS2030AT"
+"FUJITSU MHS2040AT"		194  C  "Fujitsu MHS2040AT"
+"FUJITSU MHS2060AT"             194  C  "Fujitsu MHS2060AT (Apple PowerBook G4)"
+"FUJITSU MHT2030AT"             194  C  "Fujitsu MHT2030AT"
+"FUJITSU MHT2040AT"		194  C  "Fujitsu MHT2040AT"
 "FUJITSU MPF3204AH"		194  C  "Fujitsu MPF3204AH"
 "FUJITSU MPG3204AT.*"		194  C  "Fujitsu MPG3204AT"
 "FUJITSU MPG3307AT"		194  C  "Fujitsu MPG3307AT"
 "FUJITSU MPG3409AT.*"		194  C  "Fujitsu MPG3409AT E"
-
+"FUJITSU MPG3409AH.*"           194  C  "Fujitsu MPG3409AH E"
+"FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
 
 ########################################
@@ -77,10 +71,13 @@
 ########################################
 
 "HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
-"HITACHI_DK23DA-40"		194  C  "Hitachi DK23DA-40"
 "HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
+"HITACHI_DK23CA-30B"		194  C  "Hitachi DK23CA-30B"
 "HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
-
+"HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
+"HITACHI_DK23EA-[346]0"		194  C  "Hitachi DK23EA series"
+"HITACHI_DK23FB-60"		194  C  "Hitachi DK23FB60"
+"HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
 
 ########################################
@@ -91,6 +88,13 @@
 # SMART capabilties but it was reported not to work.
 # "DJSA-2(30|32|10|20|05)"	0    C  "IBM Travelstar 20GN, 32GH, 30GT series"
 
+"IBM-DARA-212000"               0    C  "IBM Travelstar 12GN"
+"IBM-DTTA-35*"			0    C  "IBM Deskstar 16GP serie"
+
+# according to specifications they do not seems to have sensor
+# but I prefer waiting for a report
+#"IBM-DTTA-37*"			0    C  "IBM Deskstar 14GXP serie"
+
 "IBM-DJNA-35.*"                 231  C  "IBM Deskstar 25 GP serie"
 "IBM-DJNA-37.*"                 231  C  "IBM Deskstar 22 GXP serie"
 "IBM-DHEA-(34330|36480)"	0    C  "IBM Deskstar 5 serie"
@@ -98,18 +102,38 @@
 "IBM-DPTA-37.*"                 231  C  "IBM Deskstar 34GXP serie"
 "IBM-DPTA-35.*"                 231  C  "IBM Deskstar 37GP serie"
 "IBM-DTLA-30[57]0[123467][05]"  194  C  "IBM Deskstar 40GV & 75GXP series"
-"IC25N020ATDA04-0"		194  C  "IBM Travelstar 30GN/20GB IDE"
-"IC25N030ATCS04-0"              194  C  "IBM Travelstar 40GN"
+"IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN serie"
+"IC25N0[24]0ATC[SX]05-0"	194  C  "IBM Travelstar 40GNX serie"
+"IC25N0(15|20|30)ATDA04-0"	194  C  "IBM Travelstar 30GN serie"
+"IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH serie"
+"IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH serie"
 "IC35L0[12346]0AVER07"          194  C  "IBM Deskstar 60GXP serie"
-"IC35L[01][02468]0AVVA07*"	194  C  "IBM Deskstar 120GXP serie"  
+"IC35L[01][02468]0AVV[AN]07*"	194  C  "IBM Deskstar 120GXP serie"  
+"IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
 
 
 ########################################
 ############# Maxtor drives
 ########################################
 
-"MAXTOR 4K0[468]0H[234]"	194  C  "Maxtor DiamondMax D540X serie"
-"MAXTOR 6L0[2468]0[LJ][1234]"	194  C  "Maxtor DiamondMax Plus D740X family"
+#"Maxtor 2B0[012][04568]H1"		???  C  "Maxtor Fireball 541DX"
+"Maxtor 2F020J0"                        194  C  "Maxtor 2F020J0"
+"Maxtor 2F030J0"			194  C  "Maxtor 2F030J0"
+# which one must I trust ?
+#"Maxtor 4D040H2"			9    C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D040H2"                        0    C  "Maxtor 4D040H2"
+#"Maxtor 4D080H4"			12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D080H4"			9    C	"Maxtor DiamondMax D540X-4D"
+"MAXTOR 4K0[468]0H[234]"		194  C  "Maxtor DiamondMax D540X serie"
+"Maxtor 4[RA](16|12|08|06)0[LJ]0"	194  C  "Maxtor DiamondMax 16"
+"Maxtor 51024U2"			0    C	"Maxtor DiamondMax Plus 40"
+"Maxtor 5A250J0"			194  C  "Maxtor Maxline 2 250GB 5400RPM"
+"Maxtor 5T0[24]0H[24]"			0    C  "Maxtor DiamondMax Plus 60"
+"Maxtor 6E0[234]0L0"			194  C  "Maxtor DiamondMax Plus 8"
+"MAXTOR 6L0[2468]0[LJ][1234]"		194  C  "Maxtor DiamondMax Plus D740X family"
+"Maxtor 6Y(06|08|12|16|20)0[LPM]0"	194  C  "Maxtor DiamondMax Plus 9"
+"Maxtor 94098U8"			 11  C  "Maxtor DiamondMax 40 94098U8"
+
 
 
 
@@ -117,49 +141,90 @@
 ############# Quantum drives
 ########################################
 
-"QUANTUM FIREBALLP AS40.0"	0  C  "Quantum Fireball AS40"
-
+"QUANTUM FIREBALLP AS40.0"		0  C  "Quantum Fireball AS40"
+"QUANTUM FIREBALL CX10.2A"		0  C  "Quantum Fireball CX10.2A"
+#"QUANTUM FIREBALLlct10 20"		4  C  "Quantum Fireball CT10 20GB"
+# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9...
+# "QUANTUM FIREBALL_TM2110A"		9  C  "Quantum Fireball TM2110A"
 
 
 ########################################
 ############# Samsung drives
 ########################################
-
-"SAMSUNG SP(2001|4002|6003|8004)H"	194  C  "Samsung SpinPoint P40 serie"
-"SAMSUNG SV0432A"			0    C  "Samsung SV0432A"
-"SAMSUNG SV(2001|4002|6003|8004)H"	194  C  "Samsung SpinPoint V40 serie"
-
+# somenone reported a problem with the SP8004H which reports a temperature
+# 10°C below the ambient temperature
+"SAMSUNG SW0434A"					0    C  "Samsung SW0434A"
+"SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C  "Samsung SpinPoint P40 serie"
+"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C  "Samsung SpinPoint P80 serie"
+"SAMSUNG SV0432A"					0    C  "Samsung SV0432A"
+"SAMSUNG SV3002H"					0    C  "Samsung SpinPoint V30 serie"
+"SAMSUNG SV(2001|4002|6003|8004)H"			194  C  "Samsung SpinPoint V40 serie"
+#"SAMSUNG SV(0221|0602|0813|1204)H"			9    C  "Samsung SpinPoint V60 serie"
+#"SAMSUNG SV1204H"					194  C  "Samsung 120G"
+"SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 
 
 ########################################
 ############# Seagate drives
 ########################################
 
-"Seagate Technology 1275MB - ST31276A"	0    C "Seagate ST31276A"
+"Seagate Technology 1275MB - ST31276A"	0    C  "Seagate ST31276A"
 "ST3412A"				0    C  "Seagate ST3412A"
+"ST38641A"                              0    C  "Seagate ST38641A"
 "ST310210A"				0    C  "Seagate ST310210A"
 "ST310211A"				194  C  "Seagate ST310211A"
 "ST310220A"				0    C  "Seagate ST310220A"
+# SEAGATE ST313021A 13.0GB
+"ST313021A"                             0    C  "Seagate U8 ST313021A"
+"ST310240A"				0    C  "Seagate Medalist 10240 Ultra ATA-3"
 "ST315320A"				194  C  "Seagate ST315320A"
+"ST320423A"				0    C  "Seagate U10 20423, Ultra ATA/66"
 "ST320011A"				194  C  "Seagate ST320011A"
+"ST320014A"				194  C  "Seagate ST320014A (5400 rpm, 20Gb)"
 "ST320410A"				194  C  "Seagate ST320410A"
 "ST320413A"				194  C  "Seagate ST320413A"
 "ST320414A"				194  C  "Seagate ST320414A"
 "ST320420A"				194  C  "Seagate Barracuda II ST320420A"
+"ST330620A"				194  C  "Seagate ST330620A"
 "ST330621A"				194  C  "Seagate ST330621A"
 "ST330630A"				194  C  "Seagate Barracuda ST330630A"
+"ST340014A"                             194  C  "Seagate Barracuda 7200.7 40Gb"
 "ST340016A"				194  C  "Seagate ST340016A"
-"ST340810A"				194  C  "Seagate ST340810A"
-"ST340824A"				194  C  "Seagate ST340824A"
-"ST360020A"				194  C  "Seagate ST360020A"
-"ST360021A"				194  C  "Seagate ST360021A"
-"ST380021A"				194  C  "Seagate ST380021A"
+"ST340810A"				194  C  "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)"
+"ST340823A"				194  C  "Seagate U Series 5 40823"
+"ST340824A"				194  C  "Seagate Barracuda III"
+"ST360015A"				194  C  "Seagate Barracuda V ST360015A"
+"ST360020A"				194  C  "Seagate U Series 60020"
+"ST360021A"				194  C  "Seagate Barracuda IV ST360021A"
+"ST380011A"				194  C  "Seagate Barracuda 7200.7 80GB"
+"ST380013AS"				194  C  "Seagate Barracuda 7200.7 80GB (Serial ATA)"
+"ST380020A"				194  C  "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
+"ST380021A"				194  C  "Seagate Barracuda IV ST380021A"
+"ST380023A"                             194  C  "Seagate Barracuda V ST380023A"
+"ST39111A"				194  C  "Seagate ST39111A (from Sun Ultra)"
+"ST3120020A"				194  C  "Seagate ST3120020A"
+"ST3120022A"				194  C  "Seagate Baraccuda 7200.7 120GB"
+"ST3120023A"                            194  C  "Seagate Barracuda V ST3120023A"
+"ST3120024A"				194  C  "Seagate Barracuda V ST3120024A"
+"ST3120026A"				194  C  "Seagate Barracuda V ST3120026A"
+"ST3160023AS"				194  C  "Seagate Barracuda V ST3160023AS (160Gb, Serial ATA)"
+"ST94011A"				194  C  "Seagate ST94011A"
+
+
+
 
 ########################################
-############# TOSHIBA Laptop
+############# TOSHIBA Laptops
 ########################################
 
-"MK4313MAT"			220    C  "TOSHIBA MK4313MAT"
+"MK4313MAT"				220  C  "Toshiba MK4313MAT"
+"TOSHIBA MK1517GAP"			0    C  "Toshiba MK1517GAP"
+"TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
+"TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
+#"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
+"TOSHIBA MK2018GAS"			226  F  "Toshiba MK2018GAS"
+"TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 
 
 
@@ -169,7 +234,23 @@
 
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"WDC WD100EB-00BHF0"            0   C "Western Digital 100EB-00BHF0"
+"WDC WD200BB-00AUA1"            0   C "Western Digital Caviar WD200BB"
+"WDC WD360GD-00FNA0"		194 C "Western Digital SATA Raptor 36.7GB"
+"WDC WD400BB-(18CA|00DE)A0"     0   C "Western Digital Caviar WD400BB"
 "WDC WD600BB-32BSA0"		0   C "Western Digital 600BB-32BSA0"
+"WDC WD800BB-00CAA1"		0   C "Western Digital WD800BB-00CAA1"
+"WDC WD800BB-22DKA0"		194 C "Western Digital 800BB-22DKA0"
+"WDC WD100EB-00BHF0"            0   C "Western Digital 100EB-00BHF0"
+"WDC WD400EB-00CPF0"		0   C "Western Digital 400EB-00CPF0"
+"WDC WD800JB-00ETA0"            194 C "Western Digital 80GB Special Edition 8MB"
+"WDC WD1600JB-00EVA0"           194 C "Western Digital 160GB Special Edition 8MB"
+"WDC WD2000JB-34EVA0"		194 C "Western Digital 200GB Special Edition 8MB"
+"WDC WD2500JB-32FUA0"		194 C "Western Digital 250GB Special Edition 8MB"
 "WDC AC420400D"                 231 C "Western Digital Caviar AC420400D"
-
+"WDC AC418000D"			231 C "Western Digital AC418000D"
+"WDC WD135BA"			231 C "Wetsern Digital WD135BA"
+# not sure for next
+# "WDC WD800JB-00CRA1"            9 C "Western Digital Caviar WD800JB"
+# "WDC WD800JB-00CRA1"		199 C "Western Digital Caviar WD800JB"
+# "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
+# "WDC WD273BA"			9   C "Western Digital WD273BA"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild
index 433a5a4ebb2c..5cdfe7301c0d 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild,v 1.1 2005/07/13 16:30:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta13.ebuild,v 1.1.1.1 2005/11/30 10:00:13 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.guzu.net/linux/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
 DEPEND="virtual/libc
@@ -50,6 +50,6 @@ src_install() {
 		doins ${FILESDIR}/hddtemp.db
 	fi
 
-	insinto /etc/conf.d ; donewins ${FILESDIR}/hddtemp-conf.d hddtemp
-	exeinto /etc/init.d ; newexe ${FILESDIR}/hddtemp-init hddtemp
+	newconfd ${FILESDIR}/hddtemp-conf.d hddtemp
+	newinitd ${FILESDIR}/hddtemp-init hddtemp
 }
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild
index 9dfc54b5a399..8348d2c7cd55 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild,v 1.1 2005/11/06 12:20:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild,v 1.1.1.1 2005/11/30 10:00:13 chriswhite Exp $
 
 inherit eutils
 
@@ -15,14 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls"
 
-DEPEND="virtual/libc
-	net-misc/wget"
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-#	epatch ${FILESDIR}/${P}-setsid.patch
+	unpack ${A}
+	cd ${S}
 
 	ebegin "Trying to download the latest hddtemp.db file"
 	wget -q --timeout=10 http://www.guzu.net/linux/hddtemp.db
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index 8060c04f89e1..8bf662d61f92 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>aliz@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>spock@gentoo.org</email>
+</maintainer>
 </pkgmetadata>