epatch, sed and changelog fixes

22 files changed, 50 insertions, 56 deletions

diff --git a/app-cdr/arson/Manifest b/app-cdr/arson/Manifest
index 74cdb5426f36..c68a0e6ad0a5 100644
--- a/app-cdr/arson/Manifest
+++ b/app-cdr/arson/Manifest
@@ -1,6 +1,6 @@
 MD5 ab7bbe2ebc4c293b0b5041ee5ea0936c ChangeLog 1799
-MD5 9d3653038ab3cbb620dfe491c8635888 arson-0.9.7-r1.ebuild 921
-MD5 15fb8ae3dae132d113926c8e2b0ff940 arson-0.9.7-r2.ebuild 964
+MD5 81a821827f535fca95b6b28e30c41d41 arson-0.9.7-r1.ebuild 906
+MD5 d41ad78be02d4b7e3e5ac56de3262262 arson-0.9.7-r2.ebuild 949
 MD5 4e65110232f5e80066f3cffc9038353e arson-0.9.7-r3.ebuild 988
 MD5 ceedb2cdf1b1c9ee6a946ef373d4b6e8 arson-0.9.7.ebuild 825
 MD5 dbcb408efd85de0535addf120954d78d files/arson-0.9.7-crashfix.diff 404
diff --git a/app-cdr/arson/arson-0.9.7-r1.ebuild b/app-cdr/arson/arson-0.9.7-r1.ebuild
index 8a31f245f6f8..5da05e19c029 100644
--- a/app-cdr/arson/arson-0.9.7-r1.ebuild
+++ b/app-cdr/arson/arson-0.9.7-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-cdr/arson/arson-0.9.7-r1.ebuild,v 1.7 2003/09/05 22:57:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.7-r1.ebuild,v 1.8 2003/10/01 09:27:33 aliz Exp $
 inherit kde-base
 
 DESCRIPTION="A KDE frontend to CD burning and CD ripping tools."
@@ -26,5 +26,5 @@ use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vor
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 <${FILESDIR}/${P}-write-img-fix.diff || die
+	epatch ${FILESDIR}/${P}-write-img-fix.diff
 }
diff --git a/app-cdr/arson/arson-0.9.7-r2.ebuild b/app-cdr/arson/arson-0.9.7-r2.ebuild
index 8f502df80a88..cc568b978f0a 100644
--- a/app-cdr/arson/arson-0.9.7-r2.ebuild
+++ b/app-cdr/arson/arson-0.9.7-r2.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-cdr/arson/arson-0.9.7-r2.ebuild,v 1.3 2003/09/05 22:57:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.7-r2.ebuild,v 1.4 2003/10/01 09:27:33 aliz Exp $
 inherit kde-base
 
 DESCRIPTION="A KDE frontend to CD burning and CD ripping tools."
@@ -28,5 +28,5 @@ myconf="$myconf --with-flac"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 <${FILESDIR}/${P}-write-img-fix.diff || die
+	epatch ${FILESDIR}/${P}-write-img-fix.diff
 }
diff --git a/app-cdr/burncdda/ChangeLog b/app-cdr/burncdda/ChangeLog
index ed04a526df93..189c84333163 100644
--- a/app-cdr/burncdda/ChangeLog
+++ b/app-cdr/burncdda/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-cdr/burncdda
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncdda/ChangeLog,v 1.5 2003/02/12 03:05:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncdda/ChangeLog,v 1.6 2003/10/01 09:27:33 aliz Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*burncdda-1.1.2.ebuild (17 July 2002)
+*burncdda-1.1.2 (17 July 2002)
 
   14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
   Added ppc keyword
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
index 2981b6f0663c..3eceb3fd61c2 100644
--- a/app-cdr/burncdda/Manifest
+++ b/app-cdr/burncdda/Manifest
@@ -1,3 +1,3 @@
-MD5 c1014a4b3a43eedcbae17148df97e688 ChangeLog 1011
+MD5 b33417cf12de8b7ae9b992db95c5a62f ChangeLog 1002
 MD5 80153c091ae12c66cd28c28694a179ab burncdda-1.1.2.ebuild 789
 MD5 4bad93941940c78bd2d3e8ec67247827 files/digest-burncdda-1.1.2 65
diff --git a/app-cdr/cdbakeoven/Manifest b/app-cdr/cdbakeoven/Manifest
index 13af198fc075..8f153afe30bc 100644
--- a/app-cdr/cdbakeoven/Manifest
+++ b/app-cdr/cdbakeoven/Manifest
@@ -1,5 +1,5 @@
 MD5 fd0ad614250491cac3cb6c115cb66b4e ChangeLog 1886
-MD5 41d30431fc9e2958f2e4af4be2c260b8 cdbakeoven-1.8.9-r1.ebuild 684
+MD5 c37db6c904ef3b3660157b90faeba815 cdbakeoven-1.8.9-r1.ebuild 666
 MD5 295e49e2e553633ee7aad41c17b63151 cdbakeoven-1.8.9.ebuild 582
 MD5 d8369dd24e253325c16d10f2b6e6f55e cdbakeoven-2.0_beta2.ebuild 666
 MD5 acc871661c249571c0efc2e6f593a6cb files/cdbakeoven-1.8.9-gcc3-gentoo.patch 620
diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild
index 6eae691f145d..1b1c6c449155 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.8.9-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-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild,v 1.4 2003/06/25 22:35:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild,v 1.5 2003/10/01 09:27:33 aliz Exp $
 
 inherit kde-base
 
@@ -21,5 +21,5 @@ newdepend ">=media-libs/libogg-1.0_rc2
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 <${FILESDIR}/cdbakeoven-1.8.9-gcc3-gentoo.patch
+	epatch ${FILESDIR}/${P}-gcc3-gentoo.patch
 }
diff --git a/app-cdr/cdbkup/Manifest b/app-cdr/cdbkup/Manifest
index 2ed6075254e8..1681afd9aa07 100644
--- a/app-cdr/cdbkup/Manifest
+++ b/app-cdr/cdbkup/Manifest
@@ -1,3 +1,3 @@
 MD5 52a806ccb2bc465ea3ca04d8c89eb0b9 ChangeLog 466
-MD5 4db234bea6a51c7cbd0263d8030ae3ac cdbkup-1.0.ebuild 936
+MD5 d60134ad127c20de8cb30a12319fe638 cdbkup-1.0.ebuild 887
 MD5 8101d99e5f13c0e2a9c90e1e7e6293b6 files/digest-cdbkup-1.0 61
diff --git a/app-cdr/cdbkup/cdbkup-1.0.ebuild b/app-cdr/cdbkup/cdbkup-1.0.ebuild
index ef0b00c3b21d..96943d154b4d 100644
--- a/app-cdr/cdbkup/cdbkup-1.0.ebuild
+++ b/app-cdr/cdbkup/cdbkup-1.0.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-cdr/cdbkup/cdbkup-1.0.ebuild,v 1.8 2003/09/20 20:46:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbkup/cdbkup-1.0.ebuild,v 1.9 2003/10/01 09:27:33 aliz Exp $
 
 DESCRIPTION="cdbkup performs full or incremental backups of local or remote filesystems onto CD-R(W)s."
 SRC_URI="mirror://sourceforge/cdbkup/${P}.tar.gz"
@@ -17,8 +17,7 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	cp Makefile.in Makefile.in.orig
-	sed "s:doc/cdbkup:doc/${P}:" Makefile.in.orig > Makefile.in
+	sed -i "s:doc/cdbkup:doc/${P}:" Makefile.in
 
 	#apply the patch
 	patch < ${S}/linuxtar_13.patch ${S}/src/cdbkup.in
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index fb1aa9c2049a..6b88544c2ed0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,14 +1,14 @@
 MD5 6b074494f4238d4a82178f0a98d608bf ChangeLog 7991
-MD5 17f8552bcc7faf7963a224b3f6e148b0 cdrtools-2.01_alpha18-r1.ebuild 2100
-MD5 38045c20a2d491110d8150103eab3565 cdrtools-2.01_alpha16.ebuild 1882
+MD5 74271bb1ef690bf0f08146bf29a3ec35 cdrtools-1.11.39-r1.ebuild 1505
+MD5 ec17af0fc75350e8f76ee88f40fe522b cdrtools-1.11.40.ebuild 1413
+MD5 77518f35fa3d3f6df4adb77535b4888f cdrtools-2.01_alpha14.ebuild 1655
+MD5 e3b43dd5a5b48b4854646ce479e2b34b cdrtools-2.01_alpha16.ebuild 1814
+MD5 1cc1590add82ff8a87991697bd0ea0ce cdrtools-2.01_alpha18-r1.ebuild 2035
 MD5 dbca373ea9623e091bd4193b24d6c82a metadata.xml 579
-MD5 519ce46b1947a9f57b178f1f1de05658 cdrtools-1.11.40.ebuild 1481
-MD5 f9d8068172c5b2847f2f55912b3b5f25 cdrtools-1.11.39-r1.ebuild 1573
-MD5 5b974cefd94780d467c13d57b5161a0f cdrtools-2.01_alpha14.ebuild 1723
-MD5 8261622dd12c6ef676c1791b8bba3620 files/digest-cdrtools-2.01_alpha18-r1 142
-MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
-MD5 a5d2f2339b75bf4919653d91b83ec07d files/digest-cdrtools-2.01_alpha16 69
-MD5 5bf9f8da4dc6b60ac0c2dca1de9fd881 files/digest-cdrtools-1.11.40 70
 MD5 4dc0a1f8df2b42d358365eeb526e867d files/cdrecord-scsiopen-format.patch 352
+MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
 MD5 2450e62730dcd41c5fe0c92844d92f1a files/digest-cdrtools-1.11.39-r1 70
+MD5 5bf9f8da4dc6b60ac0c2dca1de9fd881 files/digest-cdrtools-1.11.40 70
 MD5 983f5f65e96f3381528cf89c733781d9 files/digest-cdrtools-2.01_alpha14 69
+MD5 a5d2f2339b75bf4919653d91b83ec07d files/digest-cdrtools-2.01_alpha16 69
+MD5 8261622dd12c6ef676c1791b8bba3620 files/digest-cdrtools-2.01_alpha18-r1 142
diff --git a/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild b/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild
index 9f2b20770830..c00a9785de58 100644
--- a/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-1.11.39-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-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild,v 1.2 2003/09/05 01:30:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild,v 1.3 2003/10/01 09:27:33 aliz Exp $
 
 inherit eutils
 
@@ -20,8 +20,7 @@ SRC_URI="ftp://ftp.fokus.gmd.de:21/pub/unix/cdrecord/alpha/${MY_P}.tar.bz2"
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DEFAULTS
-	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
-	mv Defaults.linux.hacked Defaults.linux
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
 
 	cd ${S}
 	epatch ${FILESDIR}/cdrecord-scsiopen-format.patch
diff --git a/app-cdr/cdrtools/cdrtools-1.11.40.ebuild b/app-cdr/cdrtools/cdrtools-1.11.40.ebuild
index 3945f96c9a86..f2a4847e5d5f 100644
--- a/app-cdr/cdrtools/cdrtools-1.11.40.ebuild
+++ b/app-cdr/cdrtools/cdrtools-1.11.40.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-cdr/cdrtools/cdrtools-1.11.40.ebuild,v 1.5 2003/07/19 20:15:52 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.40.ebuild,v 1.6 2003/10/01 09:27:33 aliz Exp $
 
 DESCRIPTION="A set of tools for CDR drives, including cdrecord."
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
@@ -18,8 +18,7 @@ SRC_URI="ftp://ftp.fokus.gmd.de:21/pub/unix/cdrecord/alpha/${MY_P}.tar.bz2"
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DEFAULTS
-	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
-	mv Defaults.linux.hacked Defaults.linux
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
 }
 
 src_compile() {
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild
index d1b85064f93a..23e821961385 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha14.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-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild,v 1.4 2003/09/05 01:30:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild,v 1.5 2003/10/01 09:27:33 aliz Exp $
 
 inherit eutils
 
@@ -26,8 +26,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch || die
 
 	cd ${S}/DEFAULTS
-	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
-	mv Defaults.linux.hacked Defaults.linux
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
 
 	cd ${S}/RULES
 	cp i386-linux-cc.rul x86_64-linux-cc.rul
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
index da62b4b47285..ad797d231560 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha16.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-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild,v 1.7 2003/09/05 01:30:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild,v 1.8 2003/10/01 09:27:33 aliz Exp $
 
 inherit eutils
 
@@ -26,8 +26,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch || die
 
 	cd ${S}/DEFAULTS
-	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
-	mv Defaults.linux.hacked Defaults.linux
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
 
 	cd ${S}/RULES
 	cp i386-linux-cc.rul x86_64-linux-cc.rul
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild
index d266c08ee08d..67e266e392b1 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha18-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-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild,v 1.4 2003/09/11 22:45:19 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild,v 1.5 2003/10/01 09:27:33 aliz Exp $
 
 inherit eutils
 
@@ -32,8 +32,7 @@ src_unpack() {
 	use dvdr && epatch ../${DVDR_PATCH_P}
 
 	cd ${S}/DEFAULTS
-	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
-	mv Defaults.linux.hacked Defaults.linux
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
 
 	cd ${S}/RULES
 	cp i386-linux-cc.rul x86_64-linux-cc.rul
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index e40bb26a242e..f3a41b6c0aea 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -1,5 +1,5 @@
 MD5 322b1aff4d3eefea658c58fcaf560484 ChangeLog 708
-MD5 eb34588a932cd77f25a19c62f12b6d0f dvd+rw-tools-5.9.4.4.4.ebuild 860
-MD5 339fa177cf5a3b2414d1aac7e2001eaf dvd+rw-tools-5.12.4.7.4.ebuild 908
-MD5 f2940e7cc3447699c05d6e14a6f01d35 files/digest-dvd+rw-tools-5.9.4.4.4 73
+MD5 52ac396e2556269268b04651f0279924 dvd+rw-tools-5.12.4.7.4.ebuild 858
+MD5 6bb1eb6860674b5d9fc0604c48a5aba2 dvd+rw-tools-5.9.4.4.4.ebuild 807
 MD5 e1522ce1ee1aa78d6fe9a41a096ae09f files/digest-dvd+rw-tools-5.12.4.7.4 74
+MD5 f2940e7cc3447699c05d6e14a6f01d35 files/digest-dvd+rw-tools-5.9.4.4.4 73
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.ebuild
index f6e44e9f8c0e..f9bf01d67847 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.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-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.ebuild,v 1.2 2003/09/27 21:40:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-5.12.4.7.4.ebuild,v 1.3 2003/10/01 09:27:33 aliz Exp $
 
 DESCRIPTION="A set of tools for DVD+RW/-RW drives."
 HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
@@ -18,10 +18,9 @@ DEPEND="virtual/glibc
 S="${WORKDIR}/${P}"
 
 src_compile() {
-	mv Makefile.m4 Makefile.m4.orig
-	sed -e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
+	sed -i -e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
 		-e "s:^CXXFLAGS=\$(WARN).*:CXXFLAGS=${CXXFLAGS} -fno-exceptions:" \
-	Makefile.m4.orig > Makefile.m4 || die
+	Makefile.m4 || die
 	emake || die
 }
 
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.ebuild
index 65ce125cddfa..ee87b049d038 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.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-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.ebuild,v 1.2 2003/09/05 22:57:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-5.9.4.4.4.ebuild,v 1.3 2003/10/01 09:27:33 aliz Exp $
 
 DESCRIPTION="A set of tools for DVD+RW/-RW drives."
 HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
@@ -18,10 +18,9 @@ DEPEND="virtual/glibc
 S="${WORKDIR}/${P}"
 
 src_compile() {
-	mv Makefile.m4 Makefile.m4.orig
-	sed -e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
+	sed -i -e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
 		-e "s:^CXXFLAGS=\$(WARN).*:CXXFLAGS=${CXXFLAGS} -fno-exceptions:" \
-	Makefile.m4.orig > Makefile.m4 || die
+	Makefile.m4 || die
 
 	emake || die
 }
diff --git a/app-cdr/gtoaster/Manifest b/app-cdr/gtoaster/Manifest
index c6c76049d420..fb0e164798c6 100644
--- a/app-cdr/gtoaster/Manifest
+++ b/app-cdr/gtoaster/Manifest
@@ -1,6 +1,6 @@
 MD5 4fc303cdd40ac64ef99a19c074cce620 ChangeLog 1617
 MD5 1f1fa4fad89e57159453166ed7e5c3c5 gtoaster-1.0_beta5.ebuild 2051
-MD5 db07cc6064d4d92194d27d2a434250cf gtoaster-1.0_beta6.ebuild 1862
+MD5 6a463a8c94bbec934236178a4c99126f gtoaster-1.0_beta6.ebuild 1831
 MD5 f29c8c012430473af4c8b82540fadb00 files/digest-gtoaster-1.0_beta5 65
 MD5 a44a9ce80bffcb13addfcf732f0b3a99 files/digest-gtoaster-1.0_beta6 66
 MD5 a2a4b20cf33b0568ce0660c3b2ad50f0 files/gtoaster.desktop 161
diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
index 0a68599fccfd..15b3da5e91ed 100644
--- a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_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-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.10 2003/09/05 22:57:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.11 2003/10/01 09:27:33 aliz Exp $
 
 # Fix so that updating can only be done by 'cp old.ebuild new.ebuild'
 MY_P="`echo ${P} |sed -e 's:-::' -e 's:_b:B:'`"
@@ -31,7 +31,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	patch -p1 < ${FILESDIR}/scdtosr.diff || die "patch failed"
+	epatch ${FILESDIR}/scdtosr.diff
 }
 
 src_compile() {
diff --git a/app-cdr/nrg2iso/ChangeLog b/app-cdr/nrg2iso/ChangeLog
index 9c78baae73ea..220e05848c8c 100644
--- a/app-cdr/nrg2iso/ChangeLog
+++ b/app-cdr/nrg2iso/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for app-cdr/nrg2iso
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/ChangeLog,v 1.1 2003/09/09 22:31:41 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/ChangeLog,v 1.2 2003/10/01 09:27:33 aliz Exp $
+
+*nrg2iso-0.1 (09 Sep 2003)
 
   09 Sep 2003; Chuck Short <zul@gentoo.org> :
   Initial Version by Florian Zwoch <zwoch@backenmedia.com>
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
index abb698c0aa1e..617741aaa144 100644
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@@ -1,3 +1,3 @@
-MD5 64f65f94c3632142466dd873a8cc33e6 ChangeLog 336
+MD5 a2eda5f85ce5c34236018c3b8b820214 ChangeLog 365
 MD5 669a83a83b817ae2579cfa7943991f42 nrg2iso-0.1.ebuild 620
 MD5 77b18cdbb3edf82609d713940ddf7507 files/digest-nrg2iso-0.1 54