Removed faad patch as faad2-2.0-r6 broken the build. Fixes #91799.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 14 insertions, 6 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 5c29f80fc28a..9b7482ef5396 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.76 2005/05/02 08:45:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.77 2005/05/07 17:29:33 flameeyes Exp $
+
+*avidemux-2.0.38_rc3-r1 (07 May 2005)
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -avidemux-2.0.38_rc3.ebuild, +avidemux-2.0.38_rc3-r1.ebuild:
+  Removed faad patch as faad2-2.0-r6 broken the build. Fixes #91799.
 
 *avidemux-2.0.38_rc3 (02 May 2005)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 23686d631b8f..615e097176d4 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -3,11 +3,11 @@ MD5 0aed1a48ceb9c6c76092b0799433077a avidemux-2.0.36.ebuild 2539
 MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 090c20151f2d741a8e17ee2f8db435f9 avidemux-2.0.38_rc2-r1.ebuild 2557
-MD5 cea545a5fb5dd639a9d389ec8bb1869a ChangeLog 14443
-MD5 27378d646460e4b18ea7e16fcb29bb45 avidemux-2.0.38_rc3.ebuild 2528
+MD5 9e405e53870489f65f4ca22997c29564 ChangeLog 14668
+MD5 1b4690b2c45aeb4324219ccdc03de16d avidemux-2.0.38_rc3-r1.ebuild 2614
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 82846937f7ffde09813d938fe907c5e7 files/digest-avidemux-2.0.36 68
 MD5 fa51202c1d7fc830fcd290028cb4a203 files/digest-avidemux-2.0.38_rc2 72
 MD5 3b83c791427e172d3c509c6516baa4b1 files/digest-avidemux-2.0.38_rc2-r1 142
-MD5 9d18590dacfa35033ef113ddc3f02beb files/digest-avidemux-2.0.38_rc3 141
+MD5 9d18590dacfa35033ef113ddc3f02beb files/digest-avidemux-2.0.38_rc3-r1 141
diff --git a/media-video/avidemux/avidemux-2.0.38_rc3.ebuild b/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild
index e44fe4a57cf9..52e1d559257d 100644
--- a/media-video/avidemux/avidemux-2.0.38_rc3.ebuild
+++ b/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc3.ebuild,v 1.1 2005/05/02 08:45:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild,v 1.1 2005/05/07 17:29:33 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,7 +23,7 @@ RDEPEND="xv? ( virtual/x11 )
 	>=dev-libs/libxml2-2.6.7
 	>=x11-libs/gtk+-2.4.1
 	aac? ( >=media-libs/faac-1.23.5
-	       >=media-libs/faad2-2.0-r5 )
+	       >=media-libs/faad2-2.0-r6 )
 	mad? ( media-libs/libmad )
 	xvid? ( >=media-libs/xvid-1.0.0 )
 	nls? ( >=sys-devel/gettext-0.12.1 )
@@ -50,6 +50,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S} || die
 
+	# This is no more needed from ffad2-2.0-r6
+	EPATCH_EXCLUDE="00_all_faadfix.patch"
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/patches/
 
 	cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed"
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc3 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc3-r1
index 5790c77f2812..5790c77f2812 100644
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc3
+++ b/media-video/avidemux/files/digest-avidemux-2.0.38_rc3-r1