add patch so make is replaced by autotool specified make, fixes bug #103529

Package-Manager: portage-2.0.51.22-r2

5 files changed, 38 insertions, 6 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index a9ce38dc2d64..d51a74f92a43 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.35 2005/08/28 19:45:58 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.36 2005/09/05 16:44:23 zaheerm Exp $
+
+  05 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/gst-plugins-ffmpeg-0.8.5-gmake.patch,
+  gst-plugins-ffmpeg-0.8.5.ebuild, gst-plugins-ffmpeg-0.8.6.ebuild:
+  add patch so make is replaced by autotool specified make, fixes bug
 
 *gst-plugins-ffmpeg-0.8.6 (28 Aug 2005)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 6b853e4ebe55..b75ccca95f10 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,9 +1,9 @@
 MD5 8549ce3aad75173683101661d71b7e91 gst-plugins-ffmpeg-0.8.4-r1.ebuild 1684
 MD5 8881dd3828677daa2926c754f5970b38 gst-plugins-ffmpeg-0.8.4.ebuild 1487
-MD5 5ae7af1dab6f7c3aaf47548311a14bb3 gst-plugins-ffmpeg-0.8.6.ebuild 1516
+MD5 77708ec4fdbcd8985370f94e4351bc08 gst-plugins-ffmpeg-0.8.6.ebuild 1649
 MD5 c6df16e12242d62555376bea35deb23b gst-plugins-ffmpeg-0.8.3.ebuild 1478
-MD5 5ab020d7929493a7e32aebd08102efbc gst-plugins-ffmpeg-0.8.5.ebuild 1516
-MD5 9d3ba9791770dcff59615823b216213f ChangeLog 4862
+MD5 8939b485563e5ce966b9a5508f59a394 gst-plugins-ffmpeg-0.8.5.ebuild 1628
+MD5 87d01259f2a52a9363fd64c89b924a5b ChangeLog 5104
 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
 MD5 b850e943e0aae6df3e751236cb339e0a files/digest-gst-plugins-ffmpeg-0.8.3 70
 MD5 bca5ec805820433590977e10928cc8a3 files/digest-gst-plugins-ffmpeg-0.8.4 70
@@ -11,4 +11,5 @@ MD5 1f3f598337071d9fb75bd2ced0fd0ce5 files/digest-gst-plugins-ffmpeg-0.8.5 70
 MD5 116ed34f4ffdbba9366d3d73de065842 files/digest-gst-plugins-ffmpeg-0.8.6 70
 MD5 bca5ec805820433590977e10928cc8a3 files/digest-gst-plugins-ffmpeg-0.8.4-r1 70
 MD5 46751c3c4ae072d530592ef91852936f files/gst-ffmpeg-gcc4.patch.gz 1367
+MD5 2963f26bd29fbec176f2e0fb08213e75 files/gst-plugins-ffmpeg-0.8.5-gmake.patch 322
 MD5 17bff3394f5317a370ff75f983c76d16 files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch 905
diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch
new file mode 100644
index 000000000000..949acbc6fcbc
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch
@@ -0,0 +1,10 @@
+Index: gst-ffmpeg-0.8.5/gst-libs/ext/Makefile.am
+===================================================================
+--- gst-ffmpeg-0.8.5.orig/gst-libs/ext/Makefile.am
++++ gst-ffmpeg-0.8.5/gst-libs/ext/Makefile.am
+@@ -12,4 +12,4 @@ SUBDIRS =
+ DIST_SUBDIRS = ffmpeg
+ 
+ all-local:
+-	cd ffmpeg && make
++	cd ffmpeg && $(MAKE)
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.ebuild
index 16fa67e738c5..7811eaec7546 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.ebuild,v 1.4 2005/07/13 12:01:19 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.5.ebuild,v 1.5 2005/09/05 16:44:23 zaheerm Exp $
 
 inherit flag-o-matic eutils
 
@@ -24,6 +24,14 @@ S=${WORKDIR}/${MY_P}
 DEPEND=">=media-libs/gstreamer-0.8.10
 	dev-util/pkgconfig"
 
+src_unpack() {
+        unpack ${A}
+	cd ${S}
+	# bug 103529
+	epatch ${FILESDIR}/${P}-gmake.patch
+	./autogen.sh
+}
+
 src_compile() {
 
 	# Restrictions taken from the mplayer ebuild
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.ebuild
index 38ace7ea439e..7a8a600e29ef 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.ebuild,v 1.1 2005/08/28 19:45:58 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.6.ebuild,v 1.2 2005/09/05 16:44:23 zaheerm Exp $
 
 inherit flag-o-matic eutils
 
@@ -24,6 +24,14 @@ S=${WORKDIR}/${MY_P}
 DEPEND=">=media-libs/gstreamer-0.8.10
 	dev-util/pkgconfig"
 
+src_unpack() {
+        unpack ${A}
+	cd ${S}
+
+        # bug 103529
+        epatch ${FILESDIR}/${PN}-0.8.5-gmake.patch
+	./autogen.sh
+}
 src_compile() {
 
 	# Restrictions taken from the mplayer ebuild