Fix parallel make issues, bug #121622.

(Portage version: 2.1_pre4-r1)

3 files changed, 67 insertions, 2 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 1aa908911add..1e6eeed728bd 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.110 2006/02/04 16:40:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.111 2006/02/05 23:47:39 flameeyes Exp $
+
+  05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mjpegtools-1.8.0-parallelmake.patch, mjpegtools-1.8.0-r1.ebuild:
+  Fix parallel make issues, bug #121622.
 
   04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
   mjpegtools-1.8.0-r1.ebuild:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
new file mode 100644
index 000000000000..b21995e3cbb8
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
@@ -0,0 +1,60 @@
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.am
+@@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL
+ 
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+-	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
++	libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.in
+@@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP
+ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+-	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
++	libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mplex/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.am
++++ mjpegtools-1.8.0/mplex/Makefile.am
+@@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp 
+ 
+ mplex_LDADD = \
+-	$(top_builddir)/mplex/libmplex2.la \
++	libmplex2.la \
+ 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
+Index: mjpegtools-1.8.0/mplex/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.in
++++ mjpegtools-1.8.0/mplex/Makefile.in
+@@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_mplex_OBJECTS = main.$(OBJEXT)
+ mplex_OBJECTS = $(am_mplex_OBJECTS)
+ am__DEPENDENCIES_2 =
+-mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \
+-	$(am__DEPENDENCIES_2)
++mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp 
+ mplex_LDADD = \
+-	$(top_builddir)/mplex/libmplex2.la \
++	libmplex2.la \
+ 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
+ 
+ all: all-am
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 024b7000b8a3..c32e0a4210f8 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.12 2006/02/04 16:40:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.13 2006/02/05 23:47:39 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -40,6 +40,7 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
 	elibtoolize
 }