Parallel make fix; bug #169182

(Portage version: 2.1.2-r12)

3 files changed, 73 insertions, 4 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 3b0cfec2e573..22e09bd010c1 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.89 2007/02/24 21:16:41 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.90 2007/03/05 20:10:02 dang Exp $
+
+  05 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/rhythmbox-0.9.8-multijob-fix.patch, rhythmbox-0.9.8.ebuild:
+  Parallel make fix; bug #169182
 
 *rhythmbox-0.9.8 (25 Feb 2007)
 
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch
new file mode 100644
index 000000000000..73623fe7b0f6
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch
@@ -0,0 +1,61 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/metadata/Makefile.am rhythmbox-0.9.8/metadata/Makefile.am
+--- rhythmbox-0.9.8.orig/metadata/Makefile.am	2007-01-25 06:12:16.000000000 -0500
++++ rhythmbox-0.9.8/metadata/Makefile.am	2007-03-05 14:43:09.000000000 -0500
+@@ -46,7 +46,7 @@ rhythmbox_metadata_SOURCES = 				\
+ 	rb-metadata-dbus-service.c
+ 
+ rhythmbox_metadata_LDADD = 				\
+-	$(top_builddir)/metadata/librbmetadatasvc.la	\
++	librbmetadatasvc.la				\
+ 	$(top_builddir)/lib/librb.la			\
+ 	$(RHYTHMBOX_LIBS)				\
+ 	$(DBUS_LIBS)
+@@ -57,7 +57,7 @@ test_metadata_SOURCES =					\
+ 	test-metadata.c
+ 
+ test_metadata_LDADD =					\
+-	$(top_builddir)/metadata/librbmetadata.la	\
++	librbmetadata.la				\
+ 	$(top_builddir)/lib/librb.la			\
+ 	$(RHYTHMBOX_LIBS)				\
+ 	$(DBUS_LIBS)
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/metadata/Makefile.in rhythmbox-0.9.8/metadata/Makefile.in
+--- rhythmbox-0.9.8.orig/metadata/Makefile.in	2007-02-21 04:52:21.000000000 -0500
++++ rhythmbox-0.9.8/metadata/Makefile.in	2007-03-05 14:50:23.000000000 -0500
+@@ -367,7 +367,7 @@ $(am__append_1)
+ 
+ 
+ @WITH_METADATA_HELPER_TRUE@rhythmbox_metadata_LDADD = \
+-@WITH_METADATA_HELPER_TRUE@	$(top_builddir)/metadata/librbmetadatasvc.la	\
++@WITH_METADATA_HELPER_TRUE@	librbmetadatasvc.la				\
+ @WITH_METADATA_HELPER_TRUE@	$(top_builddir)/lib/librb.la			\
+ @WITH_METADATA_HELPER_TRUE@	$(RHYTHMBOX_LIBS)				\
+ @WITH_METADATA_HELPER_TRUE@	$(DBUS_LIBS)
+@@ -380,7 +380,7 @@ $(am__append_1)
+ 
+ 
+ @WITH_METADATA_HELPER_TRUE@test_metadata_LDADD = \
+-@WITH_METADATA_HELPER_TRUE@	$(top_builddir)/metadata/librbmetadata.la	\
++@WITH_METADATA_HELPER_TRUE@	librbmetadata.la				\
+ @WITH_METADATA_HELPER_TRUE@	$(top_builddir)/lib/librb.la			\
+ @WITH_METADATA_HELPER_TRUE@	$(RHYTHMBOX_LIBS)				\
+ @WITH_METADATA_HELPER_TRUE@	$(DBUS_LIBS)
+@@ -429,7 +429,7 @@ am__rhythmbox_metadata_SOURCES_DIST = rb
+ @WITH_METADATA_HELPER_TRUE@	rb-metadata-dbus-service.$(OBJEXT)
+ rhythmbox_metadata_OBJECTS = $(am_rhythmbox_metadata_OBJECTS)
+ @WITH_METADATA_HELPER_TRUE@rhythmbox_metadata_DEPENDENCIES = \
+-@WITH_METADATA_HELPER_TRUE@	$(top_builddir)/metadata/librbmetadatasvc.la \
++@WITH_METADATA_HELPER_TRUE@	librbmetadatasvc.la \
+ @WITH_METADATA_HELPER_TRUE@	$(top_builddir)/lib/librb.la
+ @WITH_METADATA_HELPER_FALSE@rhythmbox_metadata_DEPENDENCIES =
+ rhythmbox_metadata_LDFLAGS =
+@@ -437,8 +437,7 @@ am__test_metadata_SOURCES_DIST = test-me
+ @WITH_METADATA_HELPER_TRUE@am_test_metadata_OBJECTS = \
+ @WITH_METADATA_HELPER_TRUE@	test-metadata.$(OBJEXT)
+ test_metadata_OBJECTS = $(am_test_metadata_OBJECTS)
+-@WITH_METADATA_HELPER_TRUE@test_metadata_DEPENDENCIES = \
+-@WITH_METADATA_HELPER_TRUE@	$(top_builddir)/metadata/librbmetadata.la \
++@WITH_METADATA_HELPER_TRUE@test_metadata_DEPENDENCIES = librbmetadata.la \
+ @WITH_METADATA_HELPER_TRUE@	$(top_builddir)/lib/librb.la
+ @WITH_METADATA_HELPER_FALSE@test_metadata_DEPENDENCIES =
+ test_metadata_LDFLAGS =
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
index 02806ec11b48..d8c24193e2f0 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.2 2007/02/24 21:19:07 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.3 2007/03/05 20:10:02 dang Exp $
 
 inherit gnome2 eutils
 
@@ -52,8 +52,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	app-text/scrollkeeper"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 pkg_setup() {
 
 	if ! use avahi && ! use howl; then
@@ -100,6 +98,12 @@ export GST_INSPECT=/bin/true
 USE_DESTDIR=1
 }
 
+src_unpack() {
+	gnome2_src_unpack
+	# Fix parallel build; bug #169182
+	epatch "${FILESDIR}"/${P}-multijob-fix.patch
+}
+
 src_compile() {
 	addpredict "$(unset HOME; echo ~)/.gconf"
 	addpredict "$(unset HOME; echo ~)/.gconfd"