14 files changed, 30 insertions, 237 deletions
diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 29a5aa79200d..ea552afad93a 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.28 2005/09/19 20:59:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.29 2005/11/06 12:20:48 spock Exp $
+
+*hddtemp-0.3_beta14 (06 Nov 2005)
+
+  06 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  -files/hddtemp-0.2-db_location.patch, -hddtemp-0.2.ebuild,
+  -hddtemp-0.3_beta8.ebuild, -hddtemp-0.3_beta10.ebuild,
+  -hddtemp-0.3_beta11.ebuild, -hddtemp-0.3_beta12.ebuild,
+  +hddtemp-0.3_beta14.ebuild:
+  Version bump (#111232). Removed old ebuilds.
 
   19 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
   hddtemp-0.3_beta13.ebuild:
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 4e9696c91e5c..9e3129284674 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ac68604576ccfc58e653bc0982bef4d4 metadata.xml 281
-MD5 c9b104341465cbb56ca24ae37dfd0358 hddtemp-0.3_beta12.ebuild 1220
-MD5 67358d9fae033adf04e11bd6e19204d6 hddtemp-0.3_beta10.ebuild 1135
-MD5 bce791a4aafcd4332834ca2f07d0619e hddtemp-0.3_beta11.ebuild 1219
-MD5 e69dcbf82660ed31a9b47977b2494083 ChangeLog 4893
-MD5 18f827ae137a300c155ee91af047824d hddtemp-0.3_beta13.ebuild 1276
-MD5 7ecb6cd08be82281bfdb2c4e4de32fe5 hddtemp-0.2.ebuild 940
-MD5 8bb14bf26d828268c3494f280039c866 hddtemp-0.3_beta8.ebuild 1142
-MD5 0a2d5f9cdc1a222625e215b2b4025bb5 files/digest-hddtemp-0.3_beta8 70
-MD5 52e2d71a98fe1eabc27e90f889796a6a files/hddtemp-init 538
-MD5 91e4b7762278d6c80f97ce6039442e8d files/hddtemp-0.3_beta13-setsid.patch 370
-MD5 f9c75dfa602045fbaff0c841ee327006 files/digest-hddtemp-0.3_beta11 70
-MD5 f816512c3feee3cc9a92a9a8d27e9cff files/hddtemp.db 11325
-MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
-MD5 104bbcc814d96186d58c38da7f001fda files/digest-hddtemp-0.3_beta12 71
-MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
-MD5 fb10a6dcf20731e49bdd8a408702e27a files/digest-hddtemp-0.3_beta10 70
+MD5 1feb2ee65821a48928b5638ab65aad7a ChangeLog 5236
 MD5 d2b4b7b99f1a5c3a26d093cea53e85a0 files/digest-hddtemp-0.3_beta13 71
+MD5 4784b9ba9acebc638325e817d252b9b1 files/digest-hddtemp-0.3_beta14 71
+MD5 91e4b7762278d6c80f97ce6039442e8d files/hddtemp-0.3_beta13-setsid.patch 370
 MD5 92bf0d7e78de1bafcedee9c9042df8b2 files/hddtemp-conf.d 342
+MD5 52e2d71a98fe1eabc27e90f889796a6a files/hddtemp-init 538
+MD5 f816512c3feee3cc9a92a9a8d27e9cff files/hddtemp.db 11325
+MD5 18f827ae137a300c155ee91af047824d hddtemp-0.3_beta13.ebuild 1276
+MD5 53a58650a8f1027d698952db031b455b hddtemp-0.3_beta14.ebuild 1280
+MD5 ac68604576ccfc58e653bc0982bef4d4 metadata.xml 281
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDMiQxgIKl8Uu19MoRAqHnAJwJajJLxcoggg2SVkmLVG8i8HJCVQCfVyPN
-uYLk3gJR0vIKsLQLQQSsaqk=
-=Q3qy
+iD8DBQFDbfVMchej4aZK9/cRAg3uAJ0dtBCbfa75QszkHHVpMiYeiDz4HgCfTVDd
+8V8PvsUeJdGPuTC5FCglzRA=
+=A/Mo
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.2 b/app-admin/hddtemp/files/digest-hddtemp-0.2
deleted file mode 100644
index da834b92b71a..000000000000
--- a/app-admin/hddtemp/files/digest-hddtemp-0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d703f6488850df6a6aeb21beee8a3895 hddtemp-0.2.tar.gz 11632
-MD5 fd2bb276b256ab6217acc470b832a19d hddtemp.db 8655
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10
deleted file mode 100644
index e937e9df6111..000000000000
--- a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0353c4702220bb940d19366c21b35288 hddtemp-0.3-beta10.tar.gz 245797
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11
deleted file mode 100644
index e2695e796c71..000000000000
--- a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79851534a7557a22418a3510a8f22234 hddtemp-0.3-beta11.tar.gz 249901
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta12 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta12
deleted file mode 100644
index fd2d15c9e2c7..000000000000
--- a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2 249253
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta14 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta14
new file mode 100644
index 000000000000..2590fb4bb290
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta14
@@ -0,0 +1 @@
+MD5 bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 233279
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8
deleted file mode 100644
index 0ae360612821..000000000000
--- a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b823db40872efdc03a00b7170e28b23 hddtemp-0.3-beta8.tar.bz2 197139
diff --git a/app-admin/hddtemp/files/hddtemp-0.2-db_location.patch b/app-admin/hddtemp/files/hddtemp-0.2-db_location.patch
deleted file mode 100644
index 59fba313c68e..000000000000
--- a/app-admin/hddtemp/files/hddtemp-0.2-db_location.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- hddtemp.c	Wed Jan 16 11:13:45 2002
-+++ hddtemp.c.new	Mon Jun 10 16:25:06 2002
-@@ -44,11 +44,11 @@
- #define F_to_C(val) (int)(((double)(val)-32.0)/1.8)
- #define C_to_F(val) (int)(((double)(val)*1.8)+32)
- 
- #define HDDTEMP_VERSION        "0.2"
- #define DEFAULT_ATTRIBUTE_ID   194
--#define DEFAULT_DATABASE_PATH  "/usr/share/hddtemp.db"
-+#define DEFAULT_DATABASE_PATH  "/usr/share/hddtemp/hddtemp.db"
- #define MAX_LINE_LEN           1024
- 
- struct harddrive_entry   *supported_drives = NULL;
- struct harddrive_entry   **last_entry = &supported_drives;
- struct harddrive_entry   *drive_entry;
diff --git a/app-admin/hddtemp/hddtemp-0.2.ebuild b/app-admin/hddtemp/hddtemp-0.2.ebuild
deleted file mode 100644
index 0d4cb2b60650..000000000000
--- a/app-admin/hddtemp/hddtemp-0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.26 2005/01/01 11:05:22 eradicator Exp $
-
-inherit eutils toolchain-funcs
-
-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/linux/${P}.tar.gz
-	mirror://gentoo/hddtemp.db"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	# patch hddtemp.c
-	epatch ${FILESDIR}/hddtemp-0.2-db_location.patch
-
-	# patch Makefile
-	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
-		-e "s:^CC.*:CC=$(tc-getCC):" \
-		Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dobin hddtemp || die
-	insinto /usr/share/hddtemp
-	doins ${DISTDIR}/hddtemp.db
-	dodoc README
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
deleted file mode 100644
index 79e60ea72cab..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild,v 1.8 2005/01/01 11:05:22 eradicator Exp $
-
-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/linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc -amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/wget"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	ebegin "Trying to download the latest hddtemp.db file"
-	wget -q --timeout=10 http://www.guzu.net/linux/hddtemp.db
-	eend $?
-}
-
-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
-	if [ -f hddtemp.db ]; then
-		doins hddtemp.db
-	else
-		doins ${FILESDIR}/hddtemp.db
-	fi
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
deleted file mode 100644
index 6cd97cf70b2d..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild,v 1.11 2005/09/22 03:25:02 vapier Exp $
-
-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/linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc -sparc amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/wget"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	ebegin "Trying to download the latest hddtemp.db file"
-	wget -q --timeout=10 http://www.guzu.net/linux/hddtemp.db
-	eend $?
-}
-
-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
-	if [ -f hddtemp.db ]; then
-		doins hddtemp.db
-	else
-		doins ${FILESDIR}/hddtemp.db
-	fi
-
-	newconfd ${FILESDIR}/hddtemp-conf.d hddtemp
-	newinitd ${FILESDIR}/hddtemp-init hddtemp
-}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta12.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild
index 62ce1ed879d2..9dfc54b5a399 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta12.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta12.ebuild,v 1.5 2005/09/22 03:25:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta14.ebuild,v 1.1 2005/11/06 12:20:48 spock Exp $
+
+inherit eutils
 
 MY_P=${P/_beta/-beta}
 
@@ -10,8 +12,8 @@ SRC_URI="http://www.guzu.net/linux/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc sparc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
 
 DEPEND="virtual/libc
 	net-misc/wget"
@@ -20,6 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
+#	epatch ${FILESDIR}/${P}-setsid.patch
 
 	ebegin "Trying to download the latest hddtemp.db file"
 	wget -q --timeout=10 http://www.guzu.net/linux/hddtemp.db
@@ -31,8 +34,8 @@ src_compile() {
 
 	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
 	# disabling nls breaks compiling
-	#use nls || myconf="--disable-nls ${myconf}"
-	econf $myconf || die
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
deleted file mode 100644
index 20f53c567c3c..000000000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.15 2005/01/01 11:05:22 eradicator Exp $
-
-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/linux/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/wget"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2 ; cd ${S}
-
-	ebegin "Trying to download the latest hddtemp.db file"
-	wget -q --timeout=10 http://www.guzu.net/linux/hddtemp.db
-	eend $?
-}
-
-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
-	if [ -f hddtemp.db ]; then
-		doins hddtemp.db
-	else
-		doins ${FILESDIR}/hddtemp.db
-	fi
-}