new ebuild version

4 files changed, 266 insertions, 24 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index f7cbb1aa0431..0ba1a19fba5b 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,8 +1,8 @@
-MD5 ff4b48d726ec446641c8e5b1752e6987 ChangeLog 2370
+MD5 9c212495a21d11ca212a7869dddacbeb ChangeLog 2368
 MD5 0d387b08a1bcdabeafc21f76613c446e hddtemp-0.2.ebuild 931
 MD5 4717792df38b80a0751a4d5d514f7a90 hddtemp-0.3_beta6-r1.ebuild 1186
 MD5 f334818ef1de70b301dbc19ba42e9e6e hddtemp-0.3_beta6.ebuild 910
-MD5 93f4a2b844157b4ec767e72a4bfde0d6 hddtemp-0.3_beta8.ebuild 1166
+MD5 f546910590a1619d47f71b3184cfdce8 hddtemp-0.3_beta8.ebuild 1163
 MD5 3b333171d51fb098667daf964bc6e656 files/hddtemp.db 10291
 MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
 MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8
index ee791ee14f18..0ae360612821 100644
--- a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8
@@ -1,2 +1 @@
 MD5 3b823db40872efdc03a00b7170e28b23 hddtemp-0.3-beta8.tar.bz2 197139
-MD5 021a27457619426205bc56fe2fe74682 hddtemp-20030831.db.gz 2847
diff --git a/app-admin/hddtemp/files/hddtemp.db b/app-admin/hddtemp/files/hddtemp.db
new file mode 100644
index 000000000000..4628ac7ba641
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.db
@@ -0,0 +1,239 @@
+#
+# DATABASE VERSION 036 (20/07/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
+# 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 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
+# MAXTOR MAXTOR 4K020H1 19.9GB
+# 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 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 MHM2100AT"		0    C  "Fujitsu MHM2100AT"
+"FUJITSU MHN2200AT"		194  C  "Fujitsu MHN2200AT"
+"FUJITSU MHN2300AT"		194  C  "Fujitsu MHN2300AT"
+"FUJITSU MHR2020AT"		194  C  "Fujitsu MHR2020AT"
+"FUJITSU MHS2060AT"             194  C  "Fujitsu MHS2060AT (Apple PowerBook G4)"
+"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"
+"FUJITSU MHR2030AT"             194  C  "Fujitsu MHR2030AT"
+
+
+########################################
+############# Hitachi drives
+########################################
+
+"HITACHI_DK228A-65"		0    C  "Hitachi DK228A-65"
+"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 serie"
+"HITACHI_DK23EA-30"             194  C  "Hitachi DK23EA-30"
+"HITACHI_DK23EA-60"             194  C  "Hitachi DK23EA-60"
+
+########################################
+############# 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"
+"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]0AVV[AN]07*"	194  C  "IBM Deskstar 120GXP serie"  
+"IC35L[01][23689]0AVV207*"	194  C  "IBM Deskstar 180GXP serie"
+
+
+########################################
+############# Maxtor drives
+########################################
+
+#"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"
+
+
+
+
+########################################
+############# Quantum drives
+########################################
+
+"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
+########################################
+# 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 SV(2001|4002|6003|8004)H"	194  C  "Samsung SpinPoint V40 serie"
+#"SAMSUNG SV(0221|0602|0813|1204)H"	9    C  "Samsung SpinPoint V60 series"
+"SAMSUNG SV(0401|0802|1203|1604)N"      194  C  "Samsung SpinPoint V80 series"
+
+
+########################################
+############# Seagate drives
+########################################
+
+"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"
+"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 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 80Go"
+"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"
+
+
+
+########################################
+############# TOSHIBA Laptops
+########################################
+
+"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"
+
+
+
+
+########################################
+############# Western Digital drives
+########################################
+
+# WDC AC310100B and WDC AC2850F are reported not working
+# no more informations were given
+"WDC WD200BB-00AUA1"            0   C "Western Digital Caviar WD200BB"
+"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 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 WD2000JB-34EVA0"		194 C "Western Digital 200GB 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_beta8.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
index d27d8b69b97f..9ccdf206624a 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
@@ -1,44 +1,48 @@
 # 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.1 2003/08/31 18:31:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.2 2003/09/01 10:22:11 aliz Exp $
 
 MY_P=${P/_beta/-beta}
-HDDDB_VERSION=20030831
-HDDDB_FILE=hddtemp-${HDDDB_VERSION}.db
-HDDDB_DIR=/usr/share/${PN}
 
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
 HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
-DEPEND="virtual/glibc"
-
-SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.bz2
-	mirror://gentoo/${HDDDB_FILE}.gz"
+DEPEND="virtual/glibc
+	net-misc/wget"
 
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.bz2"
+IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
-	gunzip <${DISTDIR}/${HDDDB_FILE}.gz >${WORKDIR}/${HDDDB_FILE}
 	cd ${S}
-	# patch Makefile
-	export WANT_AUTOCONF_2_5="1"
-	econf || die "configure failed"
-	sed -i "s:/usr/share/misc/hddtemp.db:${HDDDB_DIR}/${HDDDB_FILE}:" configure
-#	export WANT_AUTOCONF_2_5="1"
-#	econf || die "configure failed"
-	
+
+	ebegin "Trying to download the latest hddtemp.db file"
+	wget -q --timeout=10 http://coredump.free.fr/linux/hddtemp.db
+	eend $?
 }
 
 src_compile() {
-	make || die "make failed"
+	local myconf
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+# disabling nls breaks compiling
+#	use nls || myconf="--disable-nls ${myconf}"
+	echo $myconf
+	econf $myconf || die
+	emake || die
 }
 
 src_install() {
-	dobin src/hddtemp
-	insinto ${HDDDB_DIR}
-	doins ${WORKDIR}/${HDDDB_FILE} 
-	dodoc INSTALL README TODO ChangeLog COPYING
+	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
 }