Update the DB with new drives (bug #187430).

Package-Manager: portage-2.1.3.7

5 files changed, 122 insertions, 9 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 61643807485c..6363750b39d1 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.58 2007/07/29 21:35:59 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.59 2007/09/05 21:24:40 spock Exp $
+
+*hddtemp-0.3_beta15-r3 (05 Sep 2007)
+
+  05 Sep 2007; Michał Januszewski <spock@gentoo.org> +files/hddgentoo.db,
+  +hddtemp-0.3_beta15-r3.ebuild:
+  Update the DB with new drives (bug #187430).
 
   29 Jul 2007; Michał Januszewski <spock@gentoo.org>
   -files/hddtemp-0.3_beta13-setsid.patch, -hddtemp-0.3_beta13.ebuild,
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 74fd37cdc69f..f591f2ff615d 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX hddgentoo.db 372 RMD160 d94a8c44283697c0ad2230f48dcf532df6475b0e SHA1 93af7184a0d6edb66b5f456f0fcfb42648505536 SHA256 24a9bbdce8705b81cd5f383c86bba89d9627a7c79a5c3276b88f03a32b953620
+MD5 bd9ff7b7554376ad79989f4b073c177a files/hddgentoo.db 372
+RMD160 d94a8c44283697c0ad2230f48dcf532df6475b0e files/hddgentoo.db 372
+SHA256 24a9bbdce8705b81cd5f383c86bba89d9627a7c79a5c3276b88f03a32b953620 files/hddgentoo.db 372
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 RMD160 969720123d9d100ae83f6d9f3b48d2c4cd2b58b5 SHA1 72ffeecc2214c9277b5036adef53f662e3d00bb9 SHA256 85eeaff97c96d2f77a93caa3270ee598f756c4eb0da6753e5ee8602fa1a5bdec
 MD5 bed032d7702ec78e736362ce4a9d5796 files/hddtemp-0.3_beta15-byteswap.patch 1037
 RMD160 969720123d9d100ae83f6d9f3b48d2c4cd2b58b5 files/hddtemp-0.3_beta15-byteswap.patch 1037
@@ -42,10 +46,14 @@ EBUILD hddtemp-0.3_beta15-r2.ebuild 1553 RMD160 3fccf1e2727dfe2021e54545c51694a4
 MD5 2c9d2f637ff8c6e09cb04f42ece719b4 hddtemp-0.3_beta15-r2.ebuild 1553
 RMD160 3fccf1e2727dfe2021e54545c51694a4cb18a986 hddtemp-0.3_beta15-r2.ebuild 1553
 SHA256 b9ccc685bab4f5faac7d0c2a590ec00b5c1bf946cc9a4f68f1df47369d80c2ee hddtemp-0.3_beta15-r2.ebuild 1553
-MISC ChangeLog 9990 RMD160 d26fcb7a9d16d8c97c149b8895289918fcd9c2ec SHA1 083d6acdb0b801bdf40f251ecd00b05fa1a36a58 SHA256 281923bc6e29be7fbf575c565072d7ef858dc95459d5c58e699ad094a025622d
-MD5 7f3c65b6ec2749ebb59afafca99bc938 ChangeLog 9990
-RMD160 d26fcb7a9d16d8c97c149b8895289918fcd9c2ec ChangeLog 9990
-SHA256 281923bc6e29be7fbf575c565072d7ef858dc95459d5c58e699ad094a025622d ChangeLog 9990
+EBUILD hddtemp-0.3_beta15-r3.ebuild 2055 RMD160 2f12cfb4ca62b2cfd2c19b0a145bbcbc53c83893 SHA1 aae3e5b693cd9882a305a25c66346e639b5d484f SHA256 6f0061b8e699469c3bf2db670d0f12601d6207576f3f181a5dc2fe7346c442fa
+MD5 000e5421c9d836b8de975d01207d5bea hddtemp-0.3_beta15-r3.ebuild 2055
+RMD160 2f12cfb4ca62b2cfd2c19b0a145bbcbc53c83893 hddtemp-0.3_beta15-r3.ebuild 2055
+SHA256 6f0061b8e699469c3bf2db670d0f12601d6207576f3f181a5dc2fe7346c442fa hddtemp-0.3_beta15-r3.ebuild 2055
+MISC ChangeLog 10184 RMD160 50dcefb54a31d7d0c78ab1e6686231ac7ece5707 SHA1 4ec7dc6265014d158c07c1f45d9e99de19133947 SHA256 4a16c7c70de23f5094fae60e596f0ca7a89f94cb8a695d39ba59d0fbbcf24ea3
+MD5 6d29d4afc4ca1a9f828fbd87bb645c97 ChangeLog 10184
+RMD160 50dcefb54a31d7d0c78ab1e6686231ac7ece5707 ChangeLog 10184
+SHA256 4a16c7c70de23f5094fae60e596f0ca7a89f94cb8a695d39ba59d0fbbcf24ea3 ChangeLog 10184
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -56,10 +64,13 @@ SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/di
 MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15-r2 259
 RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15-r2 259
 SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15-r2 259
+MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15-r3 259
+RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15-r3 259
+SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15-r3 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGrQgechej4aZK9/cRArzzAJ9ftcuhU72/Hc4D61GK94b44t3ouACfWfaM
-wqLjp0FSSq3SR+xyOg3iiIw=
-=edNl
+iD8DBQFG3x6ichej4aZK9/cRAs/nAJoDIxCAebhYBXojIuc7xVYTIfFeoACggTz+
+kjnK0SVg3anGvXAWHgfntUo=
+=guxC
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r3 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r3
new file mode 100644
index 000000000000..e041ddf87393
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r3
@@ -0,0 +1,3 @@
+MD5 8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 256372
+RMD160 82b6affbbb14d23b5a8f3fecf3fff7acc0bd9def hddtemp-0.3-beta15.tar.bz2 256372
+SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b hddtemp-0.3-beta15.tar.bz2 256372
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
new file mode 100644
index 000000000000..432a6dfb904a
--- /dev/null
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -0,0 +1,9 @@
+#############################################
+############# Misc drives, added by Gentoo
+#############################################
+
+"ST9160821AS"								194 C "Seagate ST9160821AS"
+"ST3400620A"								194 C "Seagate Barracuda 7200.10 ST3400620A"
+"MAXTOR STM3160212A"						194 C "Maxtor STM3160212A"
+"WDC WD2500JS-23MHB0"						194 C "Western Digital 250GB, 8MB cache"
+
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild
new file mode 100644
index 000000000000..f8f3d59d2dd3
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild,v 1.1 2007/09/05 21:24:40 spock Exp $
+
+inherit eutils autotools
+
+MY_P=${P/_beta/-beta}
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="http://www.guzu.net/linux/hddtemp.php"
+SRC_URI="http://www.guzu.net/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="nls"
+
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-satacmds.patch
+	epatch ${FILESDIR}/${P}-byteswap.patch
+	epatch ${FILESDIR}/${P}-execinfo.patch
+	epatch ${FILESDIR}/${P}-nls.patch
+	epatch ${FILESDIR}/${P}-iconv.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+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 || die
+	dodoc README TODO ChangeLog
+
+	insinto /usr/share/hddtemp
+	doins ${FILESDIR}/hddtemp.db
+	doins ${FILESDIR}/hddgentoo.db
+
+	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
+	newconfd ${FILESDIR}/hddtemp-conf.d hddtemp
+	newinitd ${FILESDIR}/hddtemp-init hddtemp
+}
+
+pkg_postinst() {
+	einfo "In order to update your hddtemp database, run:"
+	einfo "  emerge --config =${CATEGORY}/${PF}"
+}
+
+update_db() {
+	local src=$1
+	local dst=$2
+
+	while read line ; do
+		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+			echo "${line}" >> "${dst}"
+		fi
+
+		id=$(echo "${line}" | grep -o '"[^"]*"')
+
+		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+	done < "${src}"
+}
+
+pkg_config() {
+	cd ${ROOT}/usr/share/hddtemp
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
+		|| die "failed to download hddtemp.db"
+
+	update_db "hddgentoo.db" "hddtemp.db"
+}