epatch, sed and changelog fixes

4 files changed, 13 insertions, 14 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 5dc7a72b8010..3f8a9a778f04 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,15 +1,15 @@
 MD5 614079bc11f79431af3af2f4829695c8 ChangeLog 3976
-MD5 2be713b26fbd85c16bd21bea7d96db7c doxygen-1.2.15-r1.ebuild 953
-MD5 04a25c87b7d0d0518d0ff213b9f80cdf doxygen-1.2.16.ebuild 955
-MD5 2c6a87027a3ac9741c4a82ee0d6c2661 doxygen-1.2.18.ebuild 1258
-MD5 23079a2654ca690e3f9b88112302ea95 doxygen-1.3.2.ebuild 2149
+MD5 badb4dd89472a82890f3ddf12494e89d doxygen-1.2.15-r1.ebuild 937
+MD5 d9a549380d8a747dcc0899a12cc2ec71 doxygen-1.2.16.ebuild 939
+MD5 7ee185dd64b07fc153fb636accf19871 doxygen-1.2.18.ebuild 1210
 MD5 194444e9e0451781eca3396e5404ef15 doxygen-1.3.ebuild 2142
+MD5 23079a2654ca690e3f9b88112302ea95 doxygen-1.3.2.ebuild 2149
 MD5 53f0df6d6e25c19b631a4e137dee68fa doxygen-1.3.3.ebuild 2152
 MD5 92e72d97f936f9a548b20e2e20e3e385 files/digest-doxygen-1.2.15-r1 71
 MD5 5e330a062f712a4ec1212fdac4eb2ec4 files/digest-doxygen-1.2.16 71
 MD5 5f7d25c12b6cceb408f76864abbf1c28 files/digest-doxygen-1.2.18 71
-MD5 cee1ecc84fa9adaafd711230f313a86c files/digest-doxygen-1.3 68
-MD5 b930ec9ff54b96c72eacc864e989d25e files/digest-doxygen-1.3.2 70
 MD5 17d3c60cd075b3eff3cbe4a5bf00b81c files/doxygen-1.2.15-r1.diff 271
 MD5 17d3c60cd075b3eff3cbe4a5bf00b81c files/doxygen-1.2.16-gentoo.diff 271
+MD5 cee1ecc84fa9adaafd711230f313a86c files/digest-doxygen-1.3 68
+MD5 b930ec9ff54b96c72eacc864e989d25e files/digest-doxygen-1.3.2 70
 MD5 282fe1e391c89b5f590758bf816160b5 files/digest-doxygen-1.3.3 70
diff --git a/app-doc/doxygen/doxygen-1.2.15-r1.ebuild b/app-doc/doxygen/doxygen-1.2.15-r1.ebuild
index 8969f7629023..becab335bd75 100644
--- a/app-doc/doxygen/doxygen-1.2.15-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.2.15-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-doc/doxygen/doxygen-1.2.15-r1.ebuild,v 1.12 2003/09/06 22:17:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.2.15-r1.ebuild,v 1.13 2003/10/01 09:51:37 aliz Exp $
 
 IUSE="qt"
 
@@ -21,7 +21,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}/addon/doxywizard
-	patch -p0 < ${FILESDIR}/${PF}.diff || die
+	epatch ${FILESDIR}/${PF}.diff
 
 }
 
diff --git a/app-doc/doxygen/doxygen-1.2.16.ebuild b/app-doc/doxygen/doxygen-1.2.16.ebuild
index b89655272937..44da54a71f20 100644
--- a/app-doc/doxygen/doxygen-1.2.16.ebuild
+++ b/app-doc/doxygen/doxygen-1.2.16.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-doc/doxygen/doxygen-1.2.16.ebuild,v 1.7 2003/09/06 22:17:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.2.16.ebuild,v 1.8 2003/10/01 09:51:37 aliz Exp $
 
 IUSE="qt"
 
@@ -21,7 +21,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}/addon/doxywizard
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 }
 
diff --git a/app-doc/doxygen/doxygen-1.2.18.ebuild b/app-doc/doxygen/doxygen-1.2.18.ebuild
index d2a9051b7857..9b50d49145b1 100644
--- a/app-doc/doxygen/doxygen-1.2.18.ebuild
+++ b/app-doc/doxygen/doxygen-1.2.18.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-doc/doxygen/doxygen-1.2.18.ebuild,v 1.10 2003/09/07 23:53:08 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.2.18.ebuild,v 1.11 2003/10/01 09:51:37 aliz Exp $
 
 DESCRIPTION="Doxygen is a documentation system for C++, Java, IDL (Corba, Microsoft and KDE-DCOP flavors) and C."
 HOMEPAGE="http://www.doxygen.org"
@@ -21,11 +21,10 @@ src_unpack() {
 
 # doxygen's setup doesn't play nicely with our CFLAGS, etc.  Make it.
 	cd ${S}/tmake/lib/linux-g++
-	cp tmake.conf tmake.conf.orig
-	sed -e "s:^TMAKE_CFLAGS\(\t*\)= .*$:TMAKE_CFLAGS\1= ${CFLAGS}:" \
+	sed -i -e "s:^TMAKE_CFLAGS\(\t*\)= .*$:TMAKE_CFLAGS\1= ${CFLAGS}:" \
 		-e "s:^TMAKE_CFLAGS_RELEASE\(\t*\)= .*$:TMAKE_CFLAGS_RELEASE\1= ${CFLAGS}:" \
 		-e "s:^TMAKE_CXXFLAGS\(\t*\)= .*$:TMAKE_CXXFLAGS\1= ${CXXFLAGS}:" \
-	tmake.conf.orig > tmake.conf
+	tmake.conf
 }
 
 src_compile()