Version bump and closing #36047.

6 files changed, 93 insertions, 7 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index a2d7ca621a14..33f55896a1eb 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,9 +1,9 @@
-MD5 711aafa5f3641a9589f2cf16b9e4cc20 hddtemp-0.3_beta11.ebuild 1284
+MD5 87eb05d3b53631fe4a1635a3b5d38e06 hddtemp-0.3_beta11.ebuild 1285
 MD5 aa07929960900de6e228505a40a82d08 hddtemp-0.2.ebuild 888
 MD5 8a2032d01e9d0e0af6de397f32bc0c52 hddtemp-0.3_beta6-r1.ebuild 1122
 MD5 e6cfe3db892faf936d189cdcaaca0371 hddtemp-0.3_beta10.ebuild 1151
 MD5 35ecb0d6325bb8c8d7a0fda9ff5f572f hddtemp-0.3_beta6.ebuild 872
-MD5 0f9e3f59f5909488ff7d836eb735688c ChangeLog 3034
+MD5 7adf73f3b845920e73631f4885f67a24 ChangeLog 3326
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 768a98916fe918986c0b2d845e2d1d10 hddtemp-0.3_beta8.ebuild 1157
 MD5 e42a32b0df5005090c105881a4cb02cc files/digest-hddtemp-0.3_beta6-r1 133
@@ -12,7 +12,7 @@ MD5 f9c75dfa602045fbaff0c841ee327006 files/digest-hddtemp-0.3_beta11 70
 MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
 MD5 0a2d5f9cdc1a222625e215b2b4025bb5 files/digest-hddtemp-0.3_beta8 70
 MD5 f816512c3feee3cc9a92a9a8d27e9cff files/hddtemp.db 11325
-MD5 4b79bd09018628d6f5e1e59e07eb5d61 files/hddtemp-conf.d 248
+MD5 f4ee6dcb7007c3f399886c72ff624ad7 files/hddtemp-conf.d 347
 MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
-MD5 257bbfe8fb729e539649a128cb12368d files/hddtemp-init 446
+MD5 d252e0579d5ddbf50da247ee695808fc files/hddtemp-init 543
 MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11
new file mode 100644
index 000000000000..e2695e796c71
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11
@@ -0,0 +1 @@
+MD5 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz 249901
diff --git a/app-admin/hddtemp/files/hddtemp-conf.d b/app-admin/hddtemp/files/hddtemp-conf.d
new file mode 100644
index 000000000000..7dbe81e7b545
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-conf.d
@@ -0,0 +1,10 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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 $
+
+# the hddtemp executable
+HDDTEMP_EXEC=/usr/sbin/hddtemp
+
+# a list of drives to check
+HDDTEMP_OPTS="/dev/hda /dev/hdb"
+
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
new file mode 100644
index 000000000000..7b0bda7a928f
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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 $
+
+depend() {
+	need localmount 
+}
+
+start() {
+	ebegin "Starting hddtemp daemon"
+	/sbin/start-stop-daemon --start --quiet --name hddtemp  \
+	--exec ${HDDTEMP_EXEC} -- -d ${HDDTEMP_OPTS}
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping hddtemp daemon"
+	start-stop-daemon --stop --quiet --name hddtemp
+	eend $?
+}
+
+
diff --git a/app-admin/hddtemp/files/hddtemp.db b/app-admin/hddtemp/files/hddtemp.db
index a62c3aca7712..09ef9ca88dc3 100644
--- a/app-admin/hddtemp/files/hddtemp.db
+++ b/app-admin/hddtemp/files/hddtemp.db
@@ -1,5 +1,5 @@
 #
-# DATABASE VERSION 03B (30/11/2003)
+# 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
@@ -196,7 +196,8 @@
 "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"
+"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"
@@ -223,7 +224,7 @@
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK2018GAS"			226  F  "Toshiba MK2018GAS"
-
+"TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 
 
 
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
new file mode 100644
index 000000000000..d8ff5a4df857
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 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_beta11.ebuild,v 1.1 2004/02/11 15:37:04 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
+
+	insinto /etc/conf.d ; donewins ${FILESDIR}/hddtemp-conf.d hddtemp
+	exeinto /etc/init.d ; donewexe ${FILESDIR}/hddtemp-init hddtemp
+}