Moved rev. with network-cron to r20 and applied fix for bug #424417 in r21.

Thanks to Martin Jürgens <martin.accounts@gmx.de> for finding the report and
the patch. The patch has been written by Eduard Bloch <blade@debian.org>, see
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479840>.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 141 insertions, 12 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index c2de180bb20b..6d2c01999c40 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.114 2012/07/31 09:30:14 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.115 2012/07/31 10:40:08 aidecoe Exp $
+
+*hddtemp-0.3_beta15-r21 (31 Jul 2012)
+*hddtemp-0.3_beta15-r20 (31 Jul 2012)
+
+  31 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  -hddtemp-0.3_beta15-r4.ebuild, +hddtemp-0.3_beta15-r20.ebuild,
+  +hddtemp-0.3_beta15-r21.ebuild, +files/hddtemp-0.3_beta15-dontwake.patch:
+  Moved rev. with network-cron to r20 and applied fix for bug #424417 in r21.
+  Thanks to Martin Jürgens <martin.accounts@gmx.de> for finding the report and
+  the patch. The patch has been written by Eduard Bloch <blade@debian.org>, see
+  <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479840>.
 
   31 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> files/hddgentoo.db:
   Added Hitachi Travelstar E7K100 to hddgentoo.db. Fixes bug #419463.
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 7e85c3fa47e9..77faba778ccd 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX hddgentoo.db 13287 SHA256 91b5b2c78a112511e3e353d5ec75ea728df342ba6e1c79776d0d387c1484728e SHA512 1f71f2711d550d527c3e149463230336a3cdccbde19638a711856080c450c9f3d77c5a20e1595ff4c20d7563bd8f9d5685fecbd69ff8df544a4028c7d6a724c2 WHIRLPOOL 1d1b750a947d0ac60b047d183ffc3b501a3b784646e594f6fc24413abe1fe1361fbf4596b57a47e9eafd27a1edf95f0a83bb048c20fe9e0c3be7627c8d560e18
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 SHA256 85eeaff97c96d2f77a93caa3270ee598f756c4eb0da6753e5ee8602fa1a5bdec SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8 WHIRLPOOL e1ce1bfae1964c97aba189158d2ea6e027a1b74fbd392e395d4ea46d69bc2412a2492d3fa1acff6472085bb4af40c88a2dd54a783db7d35b270c61619f09fb2d
+AUX hddtemp-0.3_beta15-dontwake.patch 515 SHA256 796031779f0105e7eb991e0e69d3261a484349737f09d50a2d8fdd15dbb7f544 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1 WHIRLPOOL f2b6086585263d704ca4afeba00db8b5460b9046de44020959a4f37ca22b732040e24365447bcaf55b3b21eda54752c8b155329c3ccf8db4efe16dae8490e9d5
 AUX hddtemp-0.3_beta15-execinfo.patch 751 SHA256 8f896c478f8f2b1776ff4e16fe1f12f0829d044a14e37df48e098aec80812c5c SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6 WHIRLPOOL 436c15a16a7a141a3dbd2195e14e00f46296e50091582adbab8d99e673db59b2d59caafe1d4f5f38595a770d058d6bcdffab0830323891a86ea52bf0e23fd91f
 AUX hddtemp-0.3_beta15-iconv.patch 780 SHA256 542f5b064098961b2fae4ab0185731b47d412c7e4cc8d8972694228f9bb1415f SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce WHIRLPOOL 0173f4c5afc4cabb50be1566472997106e3375e0ae61e1ff48676a08a06f199d24d98cd2ac669cd39a330f60e2b44322621dc0efdf4f4c2e9a80fde7e9035fcf
 AUX hddtemp-0.3_beta15-nls.patch 414 SHA256 c81efff92e3cd52257438b834df652cfea8535140fe8b67ebded14fd29c3dd9c SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6 WHIRLPOOL 050113fc1270ee3cd09c48275eba19bc9ea96a4854e4b6075cab03b65fd48bc35895f0d8208baccdb5b9355068a706ce5f4ec8a9dbeceaaba012053652ccd742
@@ -12,18 +13,19 @@ AUX hddtemp-init 547 SHA256 9a59bb7e8a1724930374d1188cb892f31da8099629051efbde71
 AUX update-hddtemp.db 827 SHA256 696bfaae093464f8b6c65254c3eb086d0113f728f3eaeadf4a6247630742f761 SHA512 6c350ed16bb7289a552bc1591b6a3eaaefb62092b43498608b90aa64f4a84c9cdffc4e439847bffa537341ea9dcdc28dbf1ef9b16de2dafe0ac3416d50af1273 WHIRLPOOL 2818b1eabe9cb0597eeace8a670e640f849de93a173c90cef29a21db75cc5a677eab9f4a6297666a64dba5f6dee68f6eb481e9a69c04df53535ac397c1232b1e
 DIST hddtemp-0.3-beta15.tar.bz2 256372 SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d WHIRLPOOL 2ce6a2336737e8cbb409443b874c6767c753fbe4bb700540f9a545e69cd951d3de5743d5b26bcd3a3f8e007b1364273ec85d15da8a00968895def063aaac7705
 DIST hddtemp-20080531.db.bz2 5627 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 WHIRLPOOL 7443366204127c0831ce78a5dfd3506ff82a6c79a7daf75cc79e6bba6aad0357f7092c03e792e2e4ee31c2b47a8d8a15456e7b2c176d3a1c6b4633486f450666
+EBUILD hddtemp-0.3_beta15-r20.ebuild 2711 SHA256 9ff5a75bc1c758e3da144ca3b5f25f574ae246e51cc09cd50eea096df6d7bf12 SHA512 67a5aca76e21611cf4d715ce7638ecc26677e6a50e8bea80211e67206645959d7bcf7d5ab1bcd947343e41ba07249224ea91adca7dd2e15cbf813c87f2f3b0bf WHIRLPOOL 84ca98a0a3536ea7fa925c0ab344d32391c816532e54ba97c5b68eba713690b495a0cac4cb1d92e6c05520fda72d205a392677c5f0b9fc75718d7f992bcd53f1
+EBUILD hddtemp-0.3_beta15-r21.ebuild 2753 SHA256 f53077b2be44b50d7c05d096ef97168dd13c7823ee41f090b1a0659951df39f9 SHA512 cefb5ee14ad8a48e5a9c6bbc20968d97dbb21eb278735a22faa42789efaf8fc60ecf615608b421b4aab00a0a4326863bed627a30dc77a2d727c2c6781bb606b9 WHIRLPOOL 06269afee6d9720524f9ba0ce024b77c445e05c3dec2a467e27e821d08278330b394754576b07283b820aab9a9ee6657835ff34f0a8721cebfd973b71ae214b6
 EBUILD hddtemp-0.3_beta15-r3.ebuild 2791 SHA256 be621aa99c4417a404aa0e3e79c99c1e97af4d74b1dac0cbacbb955817db0b01 SHA512 01370299d5398151122f62aa52fc314853e69157d8e64ae8818cecb796b430bc1b0ad7eaa0e618638c659ca0f1529e7549560eb88fd2cd278c13a0926cfa4d3f WHIRLPOOL 6711f3db10a9b3a839320614f40d653851f70c38fb8b80dbc04cc86aa14800a2927d14c7169a3ac7bcf6e1d9d43078353d1d6c6fe452f42089936d5ff8849da9
-EBUILD hddtemp-0.3_beta15-r4.ebuild 2710 SHA256 149baf8e25232b813ea6083a315de6eb0e43f802df624d10c503090b9dd9a29b SHA512 f51fcba21c0e541a28f5ebfa625947acd77641f618bb4b14d5d478c4115d0dba23531e22ad155ff7078bb0760e1502597f0babeed9cb76ab3c3a406086669915 WHIRLPOOL 7350b19550f22886a0394d7066d1e33172cf99b02ae0bb76705a2afaf645b446b51d4902eaafc43f1b7c7fd12bac3702657a7c1a59782640dbd259fe0d28e8e9
-MISC ChangeLog 18108 SHA256 33307fdc1fb3fcd0c71b9eaef653dd2f29de98a3e86830197800b37cc1059c4b SHA512 b29239b9a57f23c35974c1f6fd065ac539c91d2b8ed083206940acf46f92f78ac2792064fb267f9418b7144ce39def1bdfdede30377faa47baa38f4819dad9c8 WHIRLPOOL 2dc88d221d0963ddade0bce8d587f9ecbb15548f1bcb1d97587c199f54f2868113ef70726e563c019d1870d0bb6bbdfc781b93f7840d27d8163d28965c9992e2
+MISC ChangeLog 18683 SHA256 df73e8ed11f15ee57c63ecd7e4e2cc0df2463934fa3befe18a6e06826798690c SHA512 18b2e26f94a3f8aa760acf1ccd478bf8ebc12b6f3d20fa21e7527b798040c8e5966fb1d53afada001ac49d561ab8382fa449d7ade8e8ddca38191c7440d85252 WHIRLPOOL c59f4ff389b4f219642e0876fcce447c225148b74a19502a72dd5899b9c2200a82939a0518aea8abb5059ef4334427ac2123f7786a77e08348e4012bc7e416eb
 MISC metadata.xml 291 SHA256 19a53a724046c239a0b154490a8f07ee4d54e14942b507120ade8eeed4926a34 SHA512 af63c7441a0645f948bd0f8ffd2c965ee61861ad62c269c6ec95d74d70ae2f2c587542224f27107cf5b2c50c32e6b8227a0ce1100734a2fe2f7311e653da6263 WHIRLPOOL 2eac8c84e8ed85aa6dfa9935af99bd4af9a07389cb513dd952ebbd1e025205332cf6eb4d9303f8e9de1f2ba03922904ee3eaa6a764178fb1ec7e9b3fe3d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQF6WsAAoJEPATRTHh2/q135wH/Rwg8oA7LVkbLXsJPOEFl04G
-sjKFKH6Ay1PVepE0bU2lYFNmjZbMcEjNolcIMXhFIvLXUAZVU85z2+MzxTk44ouX
-3YkCtOcImowf//ss/Tp61Bdah1umP/E3n463/UbIp25x+H9qYC+RaXAUk5Ij6x6P
-Ft7bDexRRqmXYtiRRNgyGe7xNagZiJUk9JSPCGURXaLTZnB2buAq8HABxO9a9Cmu
-3uiJfJhYZ+KU6MwHx1kTivM34CzVzdiwhL1Qd6LNVAIW+pXcvHlIRXambZ6EuWmn
-9u0CAqt9HHij7Pjj1OMfnD3UhWAtb5niaPlXYzOsMPyRgZGYm6PzUK1AGyGXVt4=
-=tu0i
+iQEcBAEBCAAGBQJQF7YRAAoJEPATRTHh2/q1OwoIAJCCBgGCiEiLzeUOAJT4DblA
+zMr0QBE3a/YmUEwQU8I3AdyycpcvYKCsx/TCIbY4g2sAq2ulqzH48gFMXjH9qaPV
+D/Zez/qoFkVzTwkSwfTg2+nhsiAWqsu48ssteQJMhGt2yC8j8kf5TQop2HfSJ0RH
+u6YheSLffVwuzaIq61FBHvzAkY8BTSwQ8F59JHSd2DeJaciqrcEmyywITQD2dZYz
+g269rGahXLsXy2gnSy/GvOwhkBI9aTR5myY2jug05BmlCyIJLZgMUybO4VaCpBvj
+fw6WN55q+ZlfBInxwUI6umki9Dd0ljIyYOwqfgBciL8uRefiAEQOz8q5mVRFac4=
+=6DaB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
new file mode 100644
index 000000000000..969da7a70e40
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
@@ -0,0 +1,20 @@
+--- hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:35:01.681708074 +0200
++++ hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:33:58.172109699 +0200
+@@ -125,6 +125,17 @@
+     dsk->fd = -1;
+     return GETTEMP_NOSENSOR;
+   }
++
++  switch(ata_get_powermode(dsk->fd)) {
++  case PWM_STANDBY:
++  case PWM_SLEEPING:
++    if (!wakeup)
++      return GETTEMP_DRIVE_SLEEP;
++  case PWM_UNKNOWN:
++  case PWM_ACTIVE: /* active or idle */
++  default:
++    break;
++  }
+   
+   /* get SMART values */
+   if(sata_enable_smart(dsk->fd) != 0) {
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r20.ebuild
index d1f6cf04d50e..40c88d37064d 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r4.ebuild,v 1.7 2011/11/14 12:25:25 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r20.ebuild,v 1.1 2012/07/31 10:40:08 aidecoe Exp $
 
 EAPI=4
 
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r21.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r21.ebuild
new file mode 100644
index 000000000000..6a2a974fc6db
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r21.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 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-r21.ebuild,v 1.1 2012/07/31 10:40:08 aidecoe Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+MY_P=${P/_beta/-beta}
+DBV=20080531
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="http://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="network-cron nls"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(README TODO ChangeLog)
+
+src_prepare() {
+	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
+	epatch "${FILESDIR}"/${P}-dontwake.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+	# disabling nls breaks compiling
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/hddtemp
+	newins "${WORKDIR}/hddtemp-${DBV}.db" 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
+
+	dosbin "${FILESDIR}"/update-hddtemp.db
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
+		newexe "${T}"/hddtemp.cron update-hddtemp.db
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to update your hddtemp database, run:"
+	elog "  update-hddtemp.db"
+	elog ""
+	elog "If your hard drive is not recognized by hddtemp, please consider"
+	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
+	elog "database by filing a bug at https://bugs.gentoo.org/"
+	elog ""
+	elog "The hddtemp deamon requires a network interface to be up.  If you"
+	elog "don't have an Ethernet interface, make sure at least the loopback"
+	elog "interface is up by setting 'rc_depend_strict=\"NO\"' in /etc/rc.conf."
+	echo
+	ewarn "If hddtemp complains but finds your HDD temperature sensor, use the"
+	ewarn "--quiet option to suppress the warning."
+}
+
+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}"
+}