epatch and sed updates

4 files changed, 17 insertions, 21 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 26e10aee7891..1814237e0da9 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,11 +1,11 @@
 MD5 9c212495a21d11ca212a7869dddacbeb ChangeLog 2368
-MD5 0d387b08a1bcdabeafc21f76613c446e hddtemp-0.2.ebuild 931
-MD5 f334818ef1de70b301dbc19ba42e9e6e hddtemp-0.3_beta6.ebuild 910
-MD5 a2e0670b148cbfee55e96987c50e6f8e hddtemp-0.3_beta6-r1.ebuild 1189
+MD5 599b5f1890eace2c4bce166123db7cc2 hddtemp-0.2.ebuild 883
+MD5 44d8f5647025aed816a6bf23cd34f012 hddtemp-0.3_beta6-r1.ebuild 1117
+MD5 f8f96db76faddb87875730622af3b165 hddtemp-0.3_beta6.ebuild 867
 MD5 0039fb9ebc01e8efd51f595ea5999f7a hddtemp-0.3_beta8.ebuild 1166
+MD5 3b333171d51fb098667daf964bc6e656 files/hddtemp.db 10291
 MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
 MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
-MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
 MD5 e42a32b0df5005090c105881a4cb02cc files/digest-hddtemp-0.3_beta6-r1 133
 MD5 0a2d5f9cdc1a222625e215b2b4025bb5 files/digest-hddtemp-0.3_beta8 70
-MD5 3b333171d51fb098667daf964bc6e656 files/hddtemp.db 10291
+MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
diff --git a/app-admin/hddtemp/hddtemp-0.2.ebuild b/app-admin/hddtemp/hddtemp-0.2.ebuild
index 36ff0cfba897..5786458c8681 100644
--- a/app-admin/hddtemp/hddtemp-0.2.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.14 2003/05/09 21:43:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.15 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
 SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz
@@ -17,13 +17,12 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	# patch hddtemp.c
-	patch -p0 < ${FILESDIR}/hddtemp-0.2-db_location.patch
+	epatch ${FILESDIR}/hddtemp-0.2-db_location.patch
 
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild
index 659e5888723a..076694fcbfa7 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild,v 1.3 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild,v 1.4 2003/09/23 20:20:55 aliz Exp $
 
 MY_P=${P/_beta/-beta}
 HDDDB_VERSION=20030609
@@ -24,13 +24,11 @@ src_unpack() {
 	gunzip <${DISTDIR}/${HDDDB_FILE}.gz >${WORKDIR}/${HDDDB_FILE}
 	cd ${S}
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
-	mv db.h db.h.orig
-	sed -e "s:/etc/hddtemp.db:${HDDDB_DIR}/${HDDDB_FILE}:" \
-		db.h.orig > db.h
+		Makefile
+	sed -i -e "s:/etc/hddtemp.db:${HDDDB_DIR}/${HDDDB_FILE}:" \
+		db.h
 }
 
 src_compile() {
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
index b0d7475b8f8f..d3c6da94e8a7 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild,v 1.2 2003/05/09 21:43:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $
 
 MY_P=${P/_beta/-beta}
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
@@ -19,10 +19,9 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {