Fixed epatch lines to close bug 56870, renamed that gcc34 patch to be consistent with the patch naming policy.

4 files changed, 26 insertions, 9 deletions

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 8d57a458c8ad..720e1da1f2dd 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/dvdauthor
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.13 2004/07/10 15:35:37 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.14 2004/07/13 08:46:17 slarti Exp $
+
+  13 Jul 2004; Tom Martin <slarti@gentoo.org> dvdauthor-0.6.10.ebuild,
+  files/0.6.10-gcc34.patch:
+  Changed epatch lines from ${PV} to ${P} so that the 64bit-utf8 patch would
+  apply. Renamed 0.6.10-gcc34.patch -> dvdauthor-0.6.10-gcc34.patch for
+  consistency. Thanks for the heads up kumquat (bug 56870).
 
   10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
   +files/dvdauthor-0.6.10-utf8.patch, dvdauthor-0.6.10.ebuild:
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index abf2e7858c8d..d877a98355ea 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,10 +1,11 @@
-MD5 0416827a0e6bfbd615d710ce8a671171 ChangeLog 1824
-MD5 a2816e9cc3872f306bb1cdd5d0f92802 dvdauthor-0.5.0.ebuild 767
 MD5 385a8d4ec61787b7b6c56930db6f7aac dvdauthor-0.5.3.ebuild 775
+MD5 a2816e9cc3872f306bb1cdd5d0f92802 dvdauthor-0.5.0.ebuild 767
+MD5 11cc0bb7a179b618fe3b38735a515514 dvdauthor-0.6.10.ebuild 831
+MD5 31d14df643f2b057510d5150b29f5f4e ChangeLog 2130
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 5eea1134e4d02276d0655f6a0c0f5020 dvdauthor-0.6.10.ebuild 836
+MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/0.6.10-gcc34.patch 427
+MD5 8a50d588492e032aad69586764b81edf files/dvdauthor-0.6.10-utf8.patch 464
 MD5 237f7b3b119dec02712a341e3b1ea458 files/digest-dvdauthor-0.5.0 66
 MD5 1c2c588351a939107a17280fd17f351c files/digest-dvdauthor-0.5.3 66
-MD5 8a50d588492e032aad69586764b81edf files/dvdauthor-0.6.10-utf8.patch 464
-MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/0.6.10-gcc34.patch 427
 MD5 7dc0471c612f68f8c3cc66a8064e4263 files/digest-dvdauthor-0.6.10 68
+MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/dvdauthor-0.6.10-gcc34.patch 427
diff --git a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
index 34db6a6827c9..f0599679d1ab 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.5 2004/07/10 15:35:37 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.6 2004/07/13 08:46:17 slarti Exp $
 
 inherit eutils 64-bit
 
@@ -20,8 +20,8 @@ DEPEND="media-libs/libdvdread
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	64-bit && epatch ${FILESDIR}/${PV}-utf8.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	64-bit && epatch ${FILESDIR}/${P}-utf8.patch
 }
 
 src_install() {
diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.10-gcc34.patch b/media-video/dvdauthor/files/dvdauthor-0.6.10-gcc34.patch
new file mode 100644
index 000000000000..360289e03b62
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.6.10-gcc34.patch
@@ -0,0 +1,10 @@
+--- src/dvdvob.c.orig	2004-05-18 14:47:22.102601912 -0400
++++ src/dvdvob.c	2004-05-18 14:47:33.434879144 -0400
+@@ -1149,6 +1149,7 @@
+                         fprintf(stderr,"\n");
+                         ach->audpts[ach->numaudpts-1].pts[1]=pts0;
+                     noshow:
++;
+                     }
+                     ach->audpts[ach->numaudpts].pts[0]=pts0;
+                     ach->audpts[ach->numaudpts].pts[1]=pts1;