Revision bump. Introduces the network-cron USE flag, like usbutils and pciutils (bug #274415).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 132 insertions, 8 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index dcbfb4d69d3c..0d0bd0bbf0a1 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/hddtemp
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.74 2009/04/08 23:11:06 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.75 2009/07/03 19:24:29 spock Exp $
+
+*hddtemp-0.3_beta15-r4 (03 Jul 2009)
+
+  03 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  +hddtemp-0.3_beta15-r4.ebuild, +files/update-hddtemp.db, metadata.xml:
+  Revision bump. Introduces the network-cron USE flag, like usbutils and
+  pciutils (bug #274415).
 
   08 Apr 2009; Michał Januszewski <spock@gentoo.org> -files/hddtemp.db,
   hddtemp-0.3_beta15-r3.ebuild:
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index f08a857aed74..a85a1565cb94 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -9,15 +9,17 @@ AUX hddtemp-0.3_beta15-nls.patch 414 RMD160 85adfd2f30ddeed6ab147cc9f3e1c02bc5c1
 AUX hddtemp-0.3_beta15-satacmds.patch 986 RMD160 445eb1a1c77738b0d62595a15955708c93310b16 SHA1 c81c89d0c8770aae5f667b5416e22c75518d122b SHA256 f3ae8ebd08d598cf9292d08e5fe07f54f894da7a90f02dcc9c46bb8d37afde56
 AUX hddtemp-conf.d 410 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 SHA1 3a642df90eb05bbd4524b622c58ce35b5f4dd4e8 SHA256 4b7b6793edbe54669965bf49dac95b273f128481aabe4b2b9e6c263f0e0a9ff5
 AUX hddtemp-init 547 RMD160 7387fd49f4f525ea82895c7fa1429a635abf7ace SHA1 f441e83730105a47055d7a78785ad126bd4e3745 SHA256 bf1253682d16fc54808451925bd001afe83a0dc3926a2250e00f986bf1a29f06
+AUX update-hddtemp.db 513 RMD160 4df03179f5377189903cde6c0c98d42ab31c5ca9 SHA1 f6eb4887197dc11d450f3e0f8fd76a4934306f18 SHA256 1b3de50778895659bfb4612dff38618a0560518220f79de72de05f64258d32c6
 DIST hddtemp-0.3-beta15.tar.bz2 256372 RMD160 82b6affbbb14d23b5a8f3fecf3fff7acc0bd9def SHA1 65393b0a4d9862c030c81702d95c1acd00da275b SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
 DIST hddtemp-20080531.db.bz2 5627 RMD160 42b4bbb04dcecaf65d9cd34eba650161a7fd45b8 SHA1 8091b4aa0dd814ffe2847383ae49b7e39c7326f3 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd
 EBUILD hddtemp-0.3_beta15-r3.ebuild 2159 RMD160 eebfd6e2d03bfa0261c21c989ed07ad03a853b2f SHA1 1b22087d1837502143e9e6cb2647c5130d40c256 SHA256 a9c5bb67332862cc46e4b450878d686376e26367e1392f0994f49a45dbc1c468
-MISC ChangeLog 11991 RMD160 26b0507a780106058dd7885b1097d58c8278d9ec SHA1 bb72d93f2271f4d51b746734208007a99755d0e4 SHA256 8b93e34f14a1104264df871638255c8931886e6afa766b5a7bc0dc6952955fe9
-MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
+EBUILD hddtemp-0.3_beta15-r4.ebuild 2185 RMD160 a4e1ca9733dbb916a04b720674150f61e4be3593 SHA1 742d3fbe1019e90d4984bc6554ae9f9a80fa298c SHA256 a07ae688be71c57cd394529782d494c0f2c641848d6cf053abdb055e8cb4a253
+MISC ChangeLog 12256 RMD160 be329663dbabb04381a1a14ec4aaca72d58a22df SHA1 8fd09755658c2acda9c659ca5ea2690044090689 SHA256 cb7ca70f371905d468ecf7cfa9385f961c7807f240252d01caa34a10b50743be
+MISC metadata.xml 310 RMD160 f39a7464f5cbe15490a4e6868d1fbfd3d168c361 SHA1 e0baa9db48f51a55c64a692206b37ab21f63f8a5 SHA256 a850370c8d6b3dc1717db3baa1d7c3b36630dca172f9f27b7967e0f03b416855
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkndLyEACgkQchej4aZK9/c8uwCfXH4M0OAfw+3CXYCgsJfvKGYU
-RS8An3yCfPEkRsqT4B1Yx2g9zpPJIkYr
-=T0ty
+iEYEARECAAYFAkpOWvsACgkQchej4aZK9/dAhACfdLzr6HkXK9EJxfYxjXqqeec7
+okkAnjElLonJAYGu4MQyHdDY5O33VEzg
+=eVEr
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
new file mode 100755
index 000000000000..ecaeb5122d06
--- /dev/null
+++ b/app-admin/hddtemp/files/update-hddtemp.db
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+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}"
+}
+
+die() {
+	echo "$*"
+	exit 1
+}
+
+cd /usr/share/hddtemp
+wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db -q || die "Failed to download new hddtemp.db file"
+update_db "hddgentoo.db" "hddtemp.db"
+
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
new file mode 100644
index 000000000000..8b9f0d285783
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 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.1 2009/07/03 19:24:29 spock Exp $
+
+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://www.guzu.net/linux/hddtemp.php"
+SRC_URI="http://www.guzu.net/files/${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=""
+
+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
+	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 \
+			|| die "Failed to install update cronjob"
+	fi
+}
+
+pkg_postinst() {
+	einfo "In order to update your hddtemp database, run:"
+	einfo "  update-hddtemp.db"
+}
+
+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}"
+}
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index 36ec4f2b53d8..6a1c835a40fa 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -5,4 +5,9 @@
 <maintainer>
 	<email>spock@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='network-cron'>
+		Monthly cronjob to update hddtemp.db.
+	</flag>
+</use>
 </pkgmetadata>