Merged r7 and r24 database update approach into a single ebuild.

Bumped to EAPI 5, btw.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

3 files changed, 125 insertions, 9 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 8bf00bf3b330..a10ef8209cfa 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.153 2014/04/27 11:00:47 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.154 2014/04/27 11:11:29 aidecoe Exp $
+
+*hddtemp-0.3_beta15-r25 (27 Apr 2014)
+
+  27 Apr 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +hddtemp-0.3_beta15-r25.ebuild:
+  Merged r7 and r24 database update approach into a single ebuild.
+
+  Bumped to EAPI 5, btw.
 
   27 Apr 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
   -hddtemp-0.3_beta15-r3.ebuild, -hddtemp-0.3_beta15-r5.ebuild,
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 48c2513e1d4e..432bf77daa66 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -17,17 +17,18 @@ AUX update-hddtemp.db 827 SHA256 696bfaae093464f8b6c65254c3eb086d0113f728f3eaead
 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-r24.ebuild 2653 SHA256 a01a6f63f36aa99933c4e4ea933e606a3d3f98f59d35424984d9598ed113c833 SHA512 9d67c55a11ddcc385719460f0d2bece7778d76bd27c497bfe1f181a8be43a94ddf6a67b6b72b51ecc7a3dc6364a5ff303127f350c00ce0cee128094c1f9e7e66 WHIRLPOOL fe73b836499082e04e2609694732abf762fed528b846f76d991f16ac891a854957f5562cc11c313efb4cd3ecf66249a1d6f4bb4769763a3ca1aa6d5d58ab7453
+EBUILD hddtemp-0.3_beta15-r25.ebuild 2989 SHA256 8e68bf3fe445ac18a248d344d55da81f5168109cc56ba691efc45270220f8307 SHA512 bf895ca88217769e5976ff794c2dc3a140951ab236bec2b036cdb00a66572203d50cab169f394715482274762c4eae0078c9584da1b969d0c60a97e531bd3b19 WHIRLPOOL bb0ddd24dda94a410753e29a3b25b961c1bc430d5407c3917e840f9c9d5b58539527bab10dd0dd86eee5b99a18b18bb93fbee80fa46aa2294a2c7cfc75d3401b
 EBUILD hddtemp-0.3_beta15-r7.ebuild 2739 SHA256 41a990896093d6af341dfd900c42b90d59f1a393da738182471636ecb0c6d50c SHA512 1698d96f74f82f49ad83b2b198ca7575c4d613387b6a1a865c6f742b448fce9e4037362eb315aa1823e20f9107b7aaabe1b6fa2c2559d61af26ca78126c7f3c8 WHIRLPOOL 32f6e9b5729157756883aec8ba9b03261d47d58719909b32165627647f86349bc413e1df625b67be9daba4eb59a763483b1a11b466d8cbad02049e93acb4a057
-MISC ChangeLog 24628 SHA256 93b8740f5540771e5daf7e14cb97ff3e58b56b0897dbd8567040c4db90d9f8fc SHA512 57ea9ff0c2fc929f80c185c0af6ab17cc6799e59eae738ee8c5a25acac57f30dbc8508c81adde32e565edee403445d41ccf057f446ec1ef170a16492118d6097 WHIRLPOOL 64a13c25acfb8159d742eb873d5977f940b8b16fa5f71fc5a0f189f7153cbadedc8c64d2b5c193ad4f1139fcb3b9bf4f9c1d08d2ed862383ebe4778f054fa63e
+MISC ChangeLog 24852 SHA256 5327d8bc9ed60dd7bde4395f23e90f1bb363383a36524259192cbe29c054cf9d SHA512 f8ce9a5a1e723d859c3fdb090f5445f5e2168ccffea0f8d0c714cd6e39405d1353193b68f3d0ad86bd731f621251b9ae274b4a7fbdc2232890d593d0df8333f6 WHIRLPOOL 1633ba78a527747b5355da27600b76c1f7440be340a9d0b9f468c6c8a6e98b0de9dd19d7eff46023fe65d7d9f793b75185a0c55a14f10fdd6001d8cf34d21119
 MISC metadata.xml 291 SHA256 19a53a724046c239a0b154490a8f07ee4d54e14942b507120ade8eeed4926a34 SHA512 af63c7441a0645f948bd0f8ffd2c965ee61861ad62c269c6ec95d74d70ae2f2c587542224f27107cf5b2c50c32e6b8227a0ce1100734a2fe2f7311e653da6263 WHIRLPOOL 2eac8c84e8ed85aa6dfa9935af99bd4af9a07389cb513dd952ebbd1e025205332cf6eb4d9303f8e9de1f2ba03922904ee3eaa6a764178fb1ec7e9b3fe3d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTXONgAAoJEPATRTHh2/q1NmAH/jNlkaAkSi3Rc9+MrQCUBs4X
-XwD/9cYwS3Yr99sWTiiI18g6PwWqQPH82JjuTrdw/An+jHAkBLul6pe41urErPn4
-w8YlDuMTROXH9BjjmNLte5CFVtIgpaUjQpVQglf5xuh3w9Qv/o8mU8joJhiYTyHQ
-Ef77cmqJbdYOsuPMBWp+XVcs8MhhnemOJHaNk6L4kfNzNEmMiFSTkxQrll7gDBpX
-6rKvi7MsWVc62rcLERsOI8+1Q8YbA5kZOo1qt4uSKP01V7ueE8GkGggAj9+01FGh
-/rsPK7rFuTqEBBkoIJpJqytu232fysvj+XxSANOu8vcWxAeqlTt46Rx7/rhXSSs=
-=i4kU
+iQEcBAEBCAAGBQJTXOXiAAoJEPATRTHh2/q1sFgH/3UtjX0qsUavrakcR7eVA+aA
+FQwlR/lByTXCYiFbyA6C9PtggcjAxQksQVenfrLSPFc6J63IfY6yTb+6Ft14KYZj
+JBYdabNYv2QA1APzf/y0Yig1hyL1qU+jcSFrWx5Hn9+snueB9hxnV42dysIeYGyl
+aX64MsFn8AFz5JTzykfwMdNX6x8HtjQWhbdbuIAbzhWzlO8dhD9JpmSUxfM/95pE
+Hd1nCs8mud9BXuO9yY0DIWzrX3eLNUIDvNHYTOEhx+kIt2/llkPXD2MiDsdZ5JCZ
+03VAGpEWT7Xfi4w44/bT769Vdo0/hX/ORpUuLnOKgzKS0m4JG3v8toONeZ/RzdA=
+=vqwq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
new file mode 100644
index 000000000000..d9191a9ac16d
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 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-r25.ebuild,v 1.1 2014/04/27 11:11:29 aidecoe Exp $
+
+EAPI=5
+
+inherit eutils autotools systemd
+
+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
+	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+	if use network-cron; then
+		dosbin "${FILESDIR}"/update-hddtemp.db
+		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:"
+	if use network-cron; then
+		elog "  update-hddtemp.db"
+	else
+		elog "  emerge --config =${CATEGORY}/${PF}"
+	fi
+	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/"
+	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}"
+}
+
+pkg_config() {
+	cd "${ROOT}"/usr/share/hddtemp || die
+
+	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"
+}