Removed old revisions and fixed Gentoo headers.

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

9 files changed, 22 insertions, 491 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 0344ce8e3864..8bf00bf3b330 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.152 2014/04/27 10:52:54 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.153 2014/04/27 11:00:47 aidecoe Exp $
+
+  27 Apr 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  -hddtemp-0.3_beta15-r3.ebuild, -hddtemp-0.3_beta15-r5.ebuild,
+  -hddtemp-0.3_beta15-r6.ebuild, hddtemp-0.3_beta15-r7.ebuild,
+  -hddtemp-0.3_beta15-r22.ebuild, -hddtemp-0.3_beta15-r23.ebuild,
+  hddtemp-0.3_beta15-r24.ebuild:
+  Removed old revisions and fixed Gentoo headers.
 
   27 Apr 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> files/hddgentoo.db:
   Added new drives to hddgentoo.db. Rels bug #506444 and bug #506836.
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index e42024a75e86..48c2513e1d4e 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -16,23 +16,18 @@ AUX hddtemp.service.conf 88 SHA256 87954446f095607eb10ec281fa0ab93d782e5c19f843a
 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-r22.ebuild 2518 SHA256 c421d5d6d178e58c2cb73bf08c9111fe1ebb865a000a7c11c877ce300e34270a SHA512 f0e31780690ae0ca2cf23dde2b684d2e324fac8656ea77ea2f4422da2d080e9683d0e381d3a4b53fd53a3635a058ed845291547300f74e84b0289bbb3f75b668 WHIRLPOOL 3bf137f0d81381071167d4f0ff38071ea43018b256baa6423ea6705e7dcef6ca9f440a4a78b333eb820b942eb8a0e6088ef022a75ad236dd7cc968e9f1211ea7
-EBUILD hddtemp-0.3_beta15-r23.ebuild 2572 SHA256 84614898deb4057600602906db0eb1ac2baa70137a6a08bd9de80c61a16082df SHA512 8b18da56a9a97abdc77293b4aa8db55c05a5f7eaa3cade19b6bc7652020827179cc34d0fb9f4074ed80dfc4e0288326b26935c4b7b7d682b27c24100db186bb6 WHIRLPOOL 3dc3979a4515f61272b1ab13b53fe6ad3f3ab740908f20f3dd6ad786220847cdfc2b723b8dc4edf647735235c3d5ffe9b5d1db211a06044c4d23c7d3f2c4770c
-EBUILD hddtemp-0.3_beta15-r24.ebuild 2651 SHA256 99ede40ee5c8e24b680c2ca58128232b3cdcbd61f2987c33befb394e267d3cd7 SHA512 d1a9c556acce483959a0ffdd777900e75381d5ae95a9ec7e38dce62af65cf494e6450412000f94f0fcf8ad38cc1abc503a2b5b1b36e70ea327e6ee1a119c1f60 WHIRLPOOL 47836fb030e93e6ebf8d1cc90ab96d28206c0e4f36ea99f321465347b80c0a60568f1b46c8314e96d2de38bc37fb0d16f97ef02dd50729a28a2a8f28917fa5c5
-EBUILD hddtemp-0.3_beta15-r3.ebuild 2791 SHA256 f1f87f1c69d34d3fc99dff7a005bc27be2708a7804268e72fb24cad3e2078620 SHA512 2e79c5ab9063eff1f8b636ebbb58d40f500d1c25a7b08b4a61ac106cba69544a8b3877ff0c3f5669693f2ce14352c3168f486a6ac2ec2e0026e2efe12325fc90 WHIRLPOOL f02f0edcacb3e4086770f09f7a1ddb0b8d21cf5cfa86a1fcca271dfb320bdf76f5eda6ed35daa456af8ab406bb57f4a3181fd34bf181a28cc610840740fea609
-EBUILD hddtemp-0.3_beta15-r5.ebuild 2605 SHA256 efae99f56304d9a729fe4a01a1c01592010005105de0a51f39da6861cdfafc90 SHA512 4edd4aa3d3e4f14cae2c33f75ecc49d37ceafe959d817df874edd6a294b2a456ea32863bbedbf13ae11ae3ac0050a1c4e27eb8d8c15a47d91269369c4ba4d4b5 WHIRLPOOL 0cd343a3451e5cacb76724a33ebb921068fc1d75b23607a512360e5026986c3f4b73c8f469939e6889c6f5e3a1b72348c72f79a263f5cce17f6a85c83b2f164e
-EBUILD hddtemp-0.3_beta15-r6.ebuild 2648 SHA256 62bfee22cb05ba28dfd2e56f715078d5382c41326774697b70fd66249f19030a SHA512 a9584375acbefc2fcb2d941c408602c7c827693ac714b64448dcec639a3df9471e4e9fbfc9a3fd868794aeccd45efb6a68a8729fcba7348189467ce5aff47256 WHIRLPOOL 9d3a2f9f22f2bf017ee06183ce219d7e2dc727c9cd5f36d5f1bb78d8773120d4a7440889a2bd620428e5351ecf832ed09a66f07e40e57ebb54259e19d8379f9d
-EBUILD hddtemp-0.3_beta15-r7.ebuild 2735 SHA256 9fc778b8de9fcefc76af787e1d13c1c3ad090db4365e791fb60f0442b4c53ce6 SHA512 f2f3edaf59fd5ac65ed77d6f2708f04cf7a8ef74678c6322872599602d3ca2550010ac22cd0a97ab4dfcf0a06f75ff26de863e5253e207b942cfb980068ee3cc WHIRLPOOL 6d052ebbc8c0e81f1066e117df1babf3b0bed02573d8e2cdafcec2ab1fe26d911176f2f7df77e8f9f7a5708c81943a992f51ce559cd3100f836138f135382f3c
-MISC ChangeLog 24294 SHA256 a33b781b412822370608a31ef1c57250ec2875a7549b6a8cbce00e108853dfb3 SHA512 670424707a753e043825101e2a0f0b8ee27f8c6d7c83b3723fcd0783a55f5c138a0680fea75981399acddaf563df0597e11d7301bf7651f5debc0a5224d9c5fb WHIRLPOOL 5b4a927d44e6c829ed69bef81e01e87c3b34c60261bde7ee8b9686f907494e60c7b2b4f5f796c95253b995d000324ad937cac49976f6709c35d6ac2fc6efae3a
+EBUILD hddtemp-0.3_beta15-r24.ebuild 2653 SHA256 a01a6f63f36aa99933c4e4ea933e606a3d3f98f59d35424984d9598ed113c833 SHA512 9d67c55a11ddcc385719460f0d2bece7778d76bd27c497bfe1f181a8be43a94ddf6a67b6b72b51ecc7a3dc6364a5ff303127f350c00ce0cee128094c1f9e7e66 WHIRLPOOL fe73b836499082e04e2609694732abf762fed528b846f76d991f16ac891a854957f5562cc11c313efb4cd3ecf66249a1d6f4bb4769763a3ca1aa6d5d58ab7453
+EBUILD hddtemp-0.3_beta15-r7.ebuild 2739 SHA256 41a990896093d6af341dfd900c42b90d59f1a393da738182471636ecb0c6d50c SHA512 1698d96f74f82f49ad83b2b198ca7575c4d613387b6a1a865c6f742b448fce9e4037362eb315aa1823e20f9107b7aaabe1b6fa2c2559d61af26ca78126c7f3c8 WHIRLPOOL 32f6e9b5729157756883aec8ba9b03261d47d58719909b32165627647f86349bc413e1df625b67be9daba4eb59a763483b1a11b466d8cbad02049e93acb4a057
+MISC ChangeLog 24628 SHA256 93b8740f5540771e5daf7e14cb97ff3e58b56b0897dbd8567040c4db90d9f8fc SHA512 57ea9ff0c2fc929f80c185c0af6ab17cc6799e59eae738ee8c5a25acac57f30dbc8508c81adde32e565edee403445d41ccf057f446ec1ef170a16492118d6097 WHIRLPOOL 64a13c25acfb8159d742eb873d5977f940b8b16fa5f71fc5a0f189f7153cbadedc8c64d2b5c193ad4f1139fcb3b9bf4f9c1d08d2ed862383ebe4778f054fa63e
 MISC metadata.xml 291 SHA256 19a53a724046c239a0b154490a8f07ee4d54e14942b507120ade8eeed4926a34 SHA512 af63c7441a0645f948bd0f8ffd2c965ee61861ad62c269c6ec95d74d70ae2f2c587542224f27107cf5b2c50c32e6b8227a0ce1100734a2fe2f7311e653da6263 WHIRLPOOL 2eac8c84e8ed85aa6dfa9935af99bd4af9a07389cb513dd952ebbd1e025205332cf6eb4d9303f8e9de1f2ba03922904ee3eaa6a764178fb1ec7e9b3fe3d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTXOGHAAoJEPATRTHh2/q1k68IAJvJ0QBPt54Aqwa1ubZn0P4m
-DHW/XTx77Nt/Ay/XRe5BgkakMjNLIxgliPD1PvZXcDWs+qZOML0iYNQbGEveJuki
-qnWzBSv2SAVWO9m6PVccZSTWpjDZtOChm4kliXgevLa1uWIrrOTOsFtAs4WonoJP
-Aw4l+qubzqxfjk+mwe1S+Mfd2ch4uMbvu9mY4IWSbBQllonTX5ABL6J0ja5twff4
-ajeB/MHP+RNeC6eCofb2AbzrezRP0wUsdCKuOhmYYI53zmq040AJrZH4Rrp6kXo2
-OJlW7hh7ZtoBi11hGc6dSirFh4wIzjJ/4cD5A56L1gog3Qr8dDxqWcvlH98n3N8=
-=gWKK
+iQEcBAEBCAAGBQJTXONgAAoJEPATRTHh2/q1NmAH/jNlkaAkSi3Rc9+MrQCUBs4X
+XwD/9cYwS3Yr99sWTiiI18g6PwWqQPH82JjuTrdw/An+jHAkBLul6pe41urErPn4
+w8YlDuMTROXH9BjjmNLte5CFVtIgpaUjQpVQglf5xuh3w9Qv/o8mU8joJhiYTyHQ
+Ef77cmqJbdYOsuPMBWp+XVcs8MhhnemOJHaNk6L4kfNzNEmMiFSTkxQrll7gDBpX
+6rKvi7MsWVc62rcLERsOI8+1Q8YbA5kZOo1qt4uSKP01V7ueE8GkGggAj9+01FGh
+/rsPK7rFuTqEBBkoIJpJqytu232fysvj+XxSANOu8vcWxAeqlTt46Rx7/rhXSSs=
+=i4kU
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r22.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r22.ebuild
deleted file mode 100644
index c9a377ea4f26..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r22.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 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-r22.ebuild,v 1.4 2013/07/08 21:05:57 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/"
-	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}"
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r23.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r23.ebuild
deleted file mode 100644
index 3ff01b84adb2..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r23.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 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-r23.ebuild,v 1.2 2013/07/08 21:05:57 aidecoe Exp $
-
-EAPI=4
-
-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_dounit "${FILESDIR}"/hddtemp.service
-
-	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/"
-	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}"
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
index 7446b37a3131..24ee8e6dfb76 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r24.ebuild,v 1.1 2013/09/28 08:09:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild,v 1.2 2014/04/27 11:00:47 aidecoe Exp $
 
 EAPI=4
 
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild
deleted file mode 100644
index efa5d9c4aa1c..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 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.14 2013/07/08 21:05:57 aidecoe 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://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="nls"
-
-DEPEND=""
-RDEPEND="${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
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	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}"
-}
-
-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"
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r5.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r5.ebuild
deleted file mode 100644
index c7ca6003346a..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 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-r5.ebuild,v 1.4 2013/07/08 21:05:57 aidecoe 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://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="nls"
-
-DEPEND=""
-RDEPEND="${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
-	epatch "${FILESDIR}"/${P}-dontwake.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
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	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
-
-	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"
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild
deleted file mode 100644
index 4d9aa1d1a23c..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 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-r6.ebuild,v 1.10 2013/09/06 18:33:17 ago Exp $
-
-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="nls"
-
-DEPEND=""
-RDEPEND="${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
-	epatch "${FILESDIR}"/${P}-dontwake.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
-	systemd_dounit "${FILESDIR}"/hddtemp.service
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	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
-
-	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"
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
index cd3b0039d067..ff8c1bb49cc2 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r7.ebuild,v 1.8 2013/12/21 17:16:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild,v 1.9 2014/04/27 11:00:47 aidecoe Exp $
 
 inherit eutils autotools systemd