Version bumped, moved hddtemp.db out of portage tree.

6 files changed, 47 insertions, 212 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 57c6670f49fe..fd332fae1e76 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,6 +1,6 @@
-MD5 867cea4c38ba6438bf2b7483991f087d ChangeLog 1236
-MD5 0482992424f22c086720a8b51a9f37ad hddtemp-0.2.ebuild 933
-MD5 7e529b08b34e35c75af24a26010cd565 hddtemp-0.3_beta6.ebuild 908
+MD5 cf7d0b1d8cae5d28b5f9d732b2cd04e4 ChangeLog 1237
+MD5 cd0a2fcbe4f7b7d1537ea4dc9ff1e213 hddtemp-0.2.ebuild 934
+MD5 ec6a25712b4610a94f5bdaca98eb7f59 hddtemp-0.3_beta6.ebuild 914
 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
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.2 b/app-admin/hddtemp/files/digest-hddtemp-0.2
index bce5a79c6aa6..da834b92b71a 100644
--- a/app-admin/hddtemp/files/digest-hddtemp-0.2
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.2
@@ -1 +1,2 @@
 MD5 d703f6488850df6a6aeb21beee8a3895 hddtemp-0.2.tar.gz 11632
+MD5 fd2bb276b256ab6217acc470b832a19d hddtemp.db 8655
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta6 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta6
new file mode 100644
index 000000000000..e2c9b1419028
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta6
@@ -0,0 +1,2 @@
+MD5 884bdfc69dcdcb16e20159185c56efae hddtemp-0.3-beta6.tar.gz 35032
+MD5 fd2bb276b256ab6217acc470b832a19d hddtemp.db 8655
diff --git a/app-admin/hddtemp/files/hddtemp.db b/app-admin/hddtemp/files/hddtemp.db
deleted file mode 100644
index 9b5c162a94b9..000000000000
--- a/app-admin/hddtemp/files/hddtemp.db
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# DATABASE VERSION 020 (21/12/2002)
-#
-# 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
-# that appears most often for your brand :o)
-# 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 E 20.0GB
-# FUJITSU FUJITSU MPG3307AT 30.0GB
-# FUJITSU FUJITSU MPG3409AH 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
-# SEAGATE ST330610A 29.3GB
-# SEAGATE ST330620A 29.3GB
-# SEAGATE ST330621A 29.3GB
-# SEAGATE ST330630A 29.9GB
-# SEAGATE ST340016A 39.1GB
-# SEAGATE ST340810ACE 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 AC420400D 19.9GB
-# WESTERN DIGITAL WDC WD102AA 10.0GB
-#
-#################################################
-
-
-########################################
-############# Fujitsu drives
-########################################
-
-"FUJITSU MHN2200AT"		194  C  "Fujitsu MHN2200AT"
-"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"
-
-
-########################################
-############# Hitachi drives
-########################################
-
-"HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
-"HITACHI_DK23CA-20"		194  C  "Hitachi DK23CA-20"
-"HITACHI_DK23CA-75"		194  C  "Hitachi DK23CA-75"
-"HITACHI_DK23DA-30"		194  C  "Hitachi DK23DA-30" 
-"HITACHI_DK23DA-40"		194  C  "Hitachi DK23DA-40"
-
-
-
-########################################
-############# IBM drives
-########################################
-
-# DJSA serie is using F0h command to report temperature and also have
-# 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"
-"IBM-DHEA-(34331|36481|38451)"	0    C  "IBM Deskstar 8 serie"
-"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"
-"IC25N030ATDA04-0"              194  C  "IBM Travelstar 30GN/30GB IDE"
-"IC25N0[1234]0ATCS04-0"		194  C  "IBM Travelstar 40GN"
-"IC25T048ATDA05-0"              194  C  "IBM Travelstar 48GH"
-"IC25T060ATC[SX]05-0"		194  C  "IBM Travelstar 60GH"
-"IC35L0[12346]0AVER07"          194  C  "IBM Deskstar 60GXP serie"
-"IC35L[01][02468]0AVV[AN]07*"	194  C  "IBM Deskstar 120GXP serie"  
-"IC35L[01][2368]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 6E040L0"		194  C  "Maxtor DiamondMax Plus 8"
-"Maxtor 6Y060L0"		194  C  "Maxtor DiamondMax Plus 9"
-#"Maxtor 2B0[012][04568]H1"      ???  C  "Maxtor Fireball 541DX"
-
-
-########################################
-############# Quantum drives
-########################################
-
-"QUANTUM FIREBALLP AS40.0"	0  C  "Quantum Fireball AS40"
-# 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"
-
-
-
-########################################
-############# Seagate drives
-########################################
-
-"Seagate Technology 1275MB - ST31276A"	0    C  "Seagate ST31276A"
-"ST3412A"				0    C  "Seagate ST3412A"
-"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"
-"ST315320A"				194  C  "Seagate ST315320A"
-"ST320011A"				194  C  "Seagate ST320011A"
-"ST320410A"				194  C  "Seagate ST320410A"
-"ST320413A"				194  C  "Seagate ST320413A"
-"ST320414A"				194  C  "Seagate ST320414A"
-"ST320420A"				194  C  "Seagate Barracuda II ST320420A"
-"ST330621A"				194  C  "Seagate ST330621A"
-"ST330630A"				194  C  "Seagate Barracuda ST330630A"
-"ST340016A"				194  C  "Seagate ST340016A"
-"ST340810A"				194  C  "Seagate ST340810A"
-"ST340823A"				194  C  "Seagate ST340823A"
-"ST340824A"				194  C  "Seagate ST340824A"
-"ST360020A"				194  C  "Seagate ST360020A"
-"ST360021A"				194  C  "Seagate ST360021A"
-"ST380021A"				194  C  "Seagate Barracuda IV ST380021A"
-"ST380020A"				194  C  "Seagate ST380020A"
-"ST39111A"				194  C  "Seagate ST39111A"
-"ST3120023A"                            194  C  "Seagate ST3120023A"
-
-
-########################################
-############# TOSHIBA Laptops
-########################################
-
-"MK4313MAT"				220  C  "TOSHIBA MK4313MAT"
-"TOSHIBA MK1517GAP"			0    C  "Toshiba MK1517GAP"
-"TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
-
-
-
-
-########################################
-############# Western Digital drives
-########################################
-
-# 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 WD400BB-18CAA0"            0   C "Western Digital Caviar WD400BB"
-"WDC WD600BB-32BSA0"		0   C "Western Digital 600BB-32BSA0"
-"WDC AC420400D"                 231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"			231 C "Western Digital AC418000D"
-# not sure for next
-# "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
-# "WDC WD273BA"			9   C "Western Digital WD273BA"
-
diff --git a/app-admin/hddtemp/hddtemp-0.2.ebuild b/app-admin/hddtemp/hddtemp-0.2.ebuild
index 02841b0dd887..a11ccafd74ba 100644
--- a/app-admin/hddtemp/hddtemp-0.2.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.2.ebuild
@@ -1,9 +1,10 @@
 # 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.2.ebuild,v 1.12 2003/02/28 22:07:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.13 2003/04/14 23:28:37 mholzer Exp $
 
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
-SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz"
+SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz
+	mirror://gentoo/hddtemp.db"
 HOMEPAGE="http://coredump.free.fr/linux/harddrive.html"
 
 SLOT="0"
@@ -23,9 +24,6 @@ src_unpack() {
 	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
 		Makefile.orig > Makefile
-
-	# copy over hddtemp database file
-	cp ${FILESDIR}/hddtemp.db ./
 }
 
 src_compile() {
@@ -35,6 +33,6 @@ src_compile() {
 src_install() {
 	dobin hddtemp
 	insinto /usr/share/hddtemp
-	doins hddtemp.db
+	doins ${DISTDIR}/hddtemp.db
 	dodoc README COPYING
 }
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
new file mode 100644
index 000000000000..cd3a22486b7c
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
@@ -0,0 +1,37 @@
+# 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_beta6.ebuild,v 1.1 2003/04/14 23:28:37 mholzer Exp $
+
+MY_P=${P/_beta/-beta}
+DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz
+	mirror://gentoo/hddtemp.db"
+HOMEPAGE="http://coredump.free.fr/linux/harddrive.html"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	# patch Makefile
+	mv Makefile Makefile.orig
+	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+		-e "s:^CC.*:CC=gcc:" \
+		Makefile.orig > Makefile
+}
+
+src_compile() {
+	make || die
+}
+
+src_install() {
+	dobin hddtemp
+	insinto /etc
+	doins ${DISTDIR}/hddtemp.db
+	dodoc README TODO Changelog COPYING
+}