misc updated

6 files changed, 76 insertions, 21 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index ca95a940a375..fb63ccecc579 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.10 2003/09/01 10:22:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.11 2003/12/17 12:16:41 aliz Exp $
+
+*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. 
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 9aa2977d2c76..c5b1a655b4ce 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,14 +1,14 @@
 MD5 8e97533aec3047a117d262cbc7dfce24 hddtemp-0.2.ebuild 889
 MD5 79760bb99370ebe4a3fd9349a1741abb hddtemp-0.3_beta6-r1.ebuild 1123
-MD5 c62afc7d80a8da217aeaf4dd9765312f hddtemp-0.3_beta10.ebuild 1152
+MD5 74f6e7ddd8a33a80236664e8455c1e08 hddtemp-0.3_beta10.ebuild 1150
 MD5 1d5ab82585df356d6a9d0a851605e7ae hddtemp-0.3_beta6.ebuild 873
-MD5 9c212495a21d11ca212a7869dddacbeb ChangeLog 2368
+MD5 97589fff962549ce471ea6f667cd0220 ChangeLog 2577
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 92ccd97679dd0ec6c726fb46bcb2eb84 hddtemp-0.3_beta8.ebuild 1153
+MD5 f9831e4211a38d3cf8c1b1ef20c909d4 hddtemp-0.3_beta8.ebuild 1158
 MD5 e42a32b0df5005090c105881a4cb02cc files/digest-hddtemp-0.3_beta6-r1 133
 MD5 fb10a6dcf20731e49bdd8a408702e27a files/digest-hddtemp-0.3_beta10 70
 MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
 MD5 0a2d5f9cdc1a222625e215b2b4025bb5 files/digest-hddtemp-0.3_beta8 70
-MD5 33b51858f61cd4ca1756d0396c9d6714 files/hddtemp.db 10881
+MD5 cf2e7fe80d99ed9dc9af37af25bb7692 files/hddtemp.db 11208
 MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
 MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10
new file mode 100644
index 000000000000..e937e9df6111
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10
@@ -0,0 +1 @@
+MD5 0353c4702220bb940d19366c21b35288 hddtemp-0.3-beta10.tar.gz 245797
diff --git a/app-admin/hddtemp/files/hddtemp.db b/app-admin/hddtemp/files/hddtemp.db
index d9a15facdc5e..a62c3aca7712 100644
--- a/app-admin/hddtemp/files/hddtemp.db
+++ b/app-admin/hddtemp/files/hddtemp.db
@@ -1,5 +1,5 @@
 #
-# DATABASE VERSION 039 (27/10/2003)
+# DATABASE VERSION 03B (30/11/2003)
 #
 # 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
@@ -56,7 +56,7 @@
 "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 MHT2030AT"             194  C  "Fujitsu MHT2030AT"
 "FUJITSU MHT2040AT"		194  C  "Fujitsu MHT2040AT"
 "FUJITSU MPF3204AH"		194  C  "Fujitsu MPF3204AH"
 "FUJITSU MPG3204AT.*"		194  C  "Fujitsu MPG3204AT"
@@ -66,8 +66,6 @@
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
 
-
-
 ########################################
 ############# Hitachi drives
 ########################################
@@ -79,7 +77,7 @@
 "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"
 
 
 ########################################
@@ -155,14 +153,15 @@
 ########################################
 # 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 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"
+"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"
 
 
 ########################################
@@ -223,6 +222,7 @@
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
+"TOSHIBA MK2018GAS"			226  F  "Toshiba MK2018GAS"
 
 
 
@@ -234,6 +234,7 @@
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
 "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"
@@ -243,6 +244,7 @@
 "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"
@@ -251,4 +253,3 @@
 # "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_beta10.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
new file mode 100644
index 000000000000..4d212b5687db
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild,v 1.1 2003/12/17 12:16:41 aliz Exp $
+
+MY_P=${P/_beta/-beta}
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc -amd64"
+DEPEND="virtual/glibc
+	net-misc/wget"
+
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
+IUSE=""
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	ebegin "Trying to download the latest hddtemp.db file"
+	wget -q --timeout=10 http://coredump.free.fr/linux/hddtemp.db
+	eend $?
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+# disabling nls breaks compiling
+#	use nls || myconf="--disable-nls ${myconf}"
+	econf $myconf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc README TODO Changelog COPYING
+
+	insinto /usr/share/hddtemp
+	if [ -f hddtemp.db ]; then
+		doins hddtemp.db
+	else
+		doins ${FILESDIR}/hddtemp.db
+	fi
+}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
index 36bf3a3d22f9..fe8de7e8edcf 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.6 2003/11/05 14:58:29 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.7 2003/12/17 12:16:41 aliz Exp $
 
 MY_P=${P/_beta/-beta}
 
@@ -8,7 +8,7 @@ DESCRIPTION="A simple utility to read the temperature of SMART capable hard driv
 HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 DEPEND="virtual/glibc
 	net-misc/wget"