Fixes some strange combinations with autotools, fixing #89575.

(Portage version: 2.0.51.19)

4 files changed, 22 insertions, 3 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index a55bd87e1e24..1123de209116 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2005/04/18 15:44:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.71 2005/04/18 21:36:58 flameeyes Exp $
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avidemux-2.0.38_rc2-aclocal.patch, avidemux-2.0.38_rc2-r1.ebuild:
+  Added a patch for some strange autotools combination which doesn't look in
+  m4 directory. Fixes #89575.
 
 *avidemux-2.0.38_rc2-r1 (18 Apr 2005)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index bf4690f2ff60..0a889b3fc931 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -7,7 +7,7 @@ MD5 0aed1a48ceb9c6c76092b0799433077a avidemux-2.0.36.ebuild 2539
 MD5 162de3edb58b8605348d0c594368017c avidemux-2.0.38_rc1.ebuild 2666
 MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 ec55caf8b7cb97e215cc40f3c9d99ac1 avidemux-2.0.38_rc2-r1.ebuild 2532
+MD5 8e73f73d77ab9df7da0766178adeae74 avidemux-2.0.38_rc2-r1.ebuild 2571
 MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
 MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
@@ -28,3 +28,4 @@ MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
 MD5 4240b00a52d4c48f4c37fa919a62c75f files/digest-avidemux-2.0.38_rc2-r1 153
+MD5 7dc435f96cc9de9a1d0388947e22de48 files/avidemux-2.0.38_rc2-aclocal.patch 419
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
index a24fd6051325..7eb54ee4639d 100644
--- a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.38_rc2-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_rc2-r1.ebuild,v 1.1 2005/04/18 15:44:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild,v 1.2 2005/04/18 21:36:58 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch ${WORKDIR}/${PVR}/patches/
 
 	cp ${WORKDIR}/${PVR}/m4/* ${S}/m4 || die "cp m4 failed"
+	epatch ${FILESDIR}/${P}-aclocal.patch
 
 	make -f Makefile.dist || die "autotools failed."
 }
diff --git a/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch b/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch
new file mode 100644
index 000000000000..034b9018c229
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch
@@ -0,0 +1,12 @@
+diff -ur /home/flame/devel/hacking/avidemux-2.0.38rc2b/admin/cvs.sh admin/cvs.sh
+--- /home/flame/devel/hacking/avidemux-2.0.38rc2b/admin/cvs.sh	2004-10-22 10:18:24.000000000 +0200
++++ admin/cvs.sh	2005-04-18 22:53:39.949443056 +0200
+@@ -58,7 +58,7 @@
+ fi
+ 
+ echo "*** Creating aclocal.m4"
+-$ACLOCAL > aclocal.log || exit 1
++$ACLOCAL -I m4 > aclocal.log || exit 1
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+