Get the fix for parallel-building into the ebuild. I only saw this on git.g.o, didn't check if it had been put into the tarball.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 135 insertions, 4 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 9163e222ebba..28b08fcd8663 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/f-spot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.40 2009/08/27 21:16:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.41 2009/08/27 21:24:07 loki_val Exp $
+
+  27 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> f-spot-0.6.1.1.ebuild,
+  +files/f-spot-0.6.1.1-parallel-build.patch:
+  Get the fix for parallel-building into the ebuild. I only saw this on
+  git.g.o, didn't check if it had been put into the tarball.
 
 *f-spot-0.6.1.1 (27 Aug 2009)
 
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index 28446f2afd10..3bbf7c6fb86b 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -2,11 +2,12 @@ AUX f-spot-0.5.0.3-icon-size-crash-fix.patch 1646 RMD160 bb6144678b2ba8b256e9bab
 AUX f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch 559 RMD160 4b3cd0f12808103d057bd975b2debdac02658d3f SHA1 c51ac33e1dd34f56115dc8c94f679d14ae77c870 SHA256 4dd00083c9ad97672f00eaa3ad5b4e84f325bdda926867c678b8a55a72562505
 AUX f-spot-0.6.0.0-parallel-build.patch 2781 RMD160 fb2458f0c3b11183fa66261c6706fdadc82bf975 SHA1 3a28f4381ea4ab69954f61e153768581cbe37a95 SHA256 6f91434993f68019244f7fd968cf685ce773bd271624206f660c67b6d306fe90
 AUX f-spot-0.6.0.0-sandbox-violation.patch 2622 RMD160 6bce291d37a4c971ee067ef462715fafd0711494 SHA1 0b56957a3248774953f25c12de54727128acc40c SHA256 d09dfed85328ea8cabb078ff213c641704145a53825771dd7fef3d79a70c71f0
+AUX f-spot-0.6.1.1-parallel-build.patch 4115 RMD160 66adc17b1d7fa1d9fa9d3391d6c343c2b99d7843 SHA1 38b255c91dc251be89a4783aade0269edd40de4f SHA256 b53ee1f15d457191caea9965fa1f23832d612b667fd86d603136188a195ad566
 DIST f-spot-0.5.0.3.tar.bz2 2776582 RMD160 0b02a2a5a8133e4304dfe6d0d6e971ee6ee48d0c SHA1 9b666c1d38ea765ddbbba56c42eaa721e2f14096 SHA256 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
 DIST f-spot-0.6.0.0.tar.bz2 3006475 RMD160 48e63f47f34d715f7fad85489b2e51cc93b6da0f SHA1 1532e57bc67171e811ada19a04a17fd9c447e0d8 SHA256 90801e2f0d62a9b8710e214433dbac8d7b9cb2c8832cf03447cde15324bc6220
 DIST f-spot-0.6.1.1.tar.bz2 2814962 RMD160 3233e0d081ebbe66ff756cb75945bcbe4176e9ce SHA1 ac2abd9fabaa948c5d6dd8a418deb9b992bf46c3 SHA256 bca09c0161056535311f7409082604ceb14eea441887790bed263114c66c8be8
 EBUILD f-spot-0.5.0.3-r1.ebuild 1899 RMD160 bb9f6480af142da2b73259f3847165031ff635bd SHA1 5115307a3f0750fb4015f7a8c5b635bc554d96c1 SHA256 12f4289b98e41eae65d812e7e56ee12e16d72693f008c1afa48e4c45fc037dd0
 EBUILD f-spot-0.6.0.0.ebuild 1639 RMD160 299a29201e84a972eb4c06fe8e255d1e04b98fc8 SHA1 eebc7a14a852c31deb88bc36a410428e3bc0874c SHA256 098a9fe81490c69b83f2efa387ed9dd1def509b50d010c7d9dca8c297aacf52f
-EBUILD f-spot-0.6.1.1.ebuild 1643 RMD160 5c8d70afb58cfd66d9576469bd2c5b19d4b8d711 SHA1 61b016ab91b80aadeb9996aa51df3ba560313284 SHA256 7d243a2f75d74a79ebcba8f53524b759ca81fe6898441b495f557357c55560c8
-MISC ChangeLog 7287 RMD160 3f8534cc73b41355b35ce0a17f132fa1a0558f04 SHA1 0cde96254121ee2425fb1096fb0c0332d8bb837b SHA256 966ab20f8641cc09e3d3b57191a8d1b91d7d26550c9252f75a59b1cd1823aaaa
+EBUILD f-spot-0.6.1.1.ebuild 1700 RMD160 dc203b80920c5ca5f56e60fbba4033817e2b23b9 SHA1 5993aec79b0c2b732bee17d099847a7da49704d7 SHA256 71610ab932c8f6a3ed58efff143daf6fefedc9579129f2bbda773ac669de5c31
+MISC ChangeLog 7543 RMD160 cfe0e9b7912b7298c942c7a8412e8626042a6eaa SHA1 eb54ab3f6ef5d57bae763e00c3156b40c6003a50 SHA256 84b3ba5896a594f9f35e87979ae62901cfa0efbe72eacf01b7a62e0668acf2d3
 MISC metadata.xml 453 RMD160 8a36645394c05be09a3f1c607b2f369cc5dc00a4 SHA1 84e3d45c42c0806302316b7038267e77b07f2927 SHA256 6b85e2644101d885cfed3e808c4bfff4f9a7065933e08e739c46baf4502ad8d0
diff --git a/media-gfx/f-spot/f-spot-0.6.1.1.ebuild b/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
index c2e82e64b732..01b0b06227e1 100644
--- a/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
+++ b/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.6.1.1.ebuild,v 1.1 2009/08/27 21:16:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.6.1.1.ebuild,v 1.2 2009/08/27 21:24:07 loki_val Exp $
 
 EAPI=2
 
@@ -48,6 +48,7 @@ SCROLLKEEPER_UPDATE=0
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.6.0.0-sandbox-violation.patch"
+	epatch "${FILESDIR}/${PN}-0.6.1.1-parallel-build.patch"
 	sed  -r -i -e 's:-D[A-Z]+_DISABLE_DEPRECATED::g' \
 		lib/libfspot/Makefile.am
 	eautoreconf
diff --git a/media-gfx/f-spot/files/f-spot-0.6.1.1-parallel-build.patch b/media-gfx/f-spot/files/f-spot-0.6.1.1-parallel-build.patch
new file mode 100644
index 000000000000..efd651f23073
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.6.1.1-parallel-build.patch
@@ -0,0 +1,124 @@
+From 07f2cd2724560b4d7870e553f2900bb7265183e1 Mon Sep 17 00:00:00 2001
+From: Christian Krause <chkr@plauener.de>
+Date: Wed, 26 Aug 2009 22:51:47 +0000
+Subject: fix parallel build
+
+1. adding some missing dependencies.
+
+2. If the recursive make is called explicitely AND if the name for
+the variable is SUBDIRS then make consider the target containing
+the "make -C" call and the content of the SUBDIRS variable
+as independent targets and it will execute them in parallel.
+To prevent this behavior rename the special variable SUBDIRS to
+SUBDIR.
+---
+diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
+index 812904c..45e23fd 100644
+--- a/extensions/Exporters/FlickrExport/Makefile.am
++++ b/extensions/Exporters/FlickrExport/Makefile.am
+@@ -27,7 +27,7 @@ PKGS =					\
+ 	-pkg:gtk-sharp-2.0		\
+ 	-pkg:glade-sharp-2.0
+ 
+-SUBDIRS = 			\
++SUBDIR = 			\
+ 	FlickrNet
+ 
+ RESOURCES =				\
+@@ -40,7 +40,7 @@ mpack: $(PLUGIN_ASSEMBLY)
+ 	mautil p $(PLUGIN_ASSEMBLY)
+ 
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+-	$(MAKE) -C $(SUBDIRS)
++	$(MAKE) -C $(SUBDIR)
+ 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+ 
+ plugindir = $(pkglibdir)/extensions
+diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
+index 45e3bac..e123ada 100644
+--- a/extensions/Exporters/PicasaWebExport/Makefile.am
++++ b/extensions/Exporters/PicasaWebExport/Makefile.am
+@@ -28,7 +28,7 @@ PKGS =					\
+ 	-pkg:gtk-sharp-2.0		\
+ 	-pkg:glade-sharp-2.0
+ 
+-SUBDIRS = 			\
++SUBDIR = 			\
+ 	google-sharp
+ 
+ RESOURCES =				\
+@@ -41,7 +41,7 @@ mpack: $(PLUGIN_ASSEMBLY)
+ 	mautil p $(PLUGIN_ASSEMBLY)
+ 
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+-	$(MAKE) -C $(SUBDIRS)
++	$(MAKE) -C $(SUBDIR)
+ 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+ 
+ plugindir = $(pkglibdir)/extensions
+diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
+index 397461f..2f0dc2b 100644
+--- a/extensions/Exporters/SmugMugExport/Makefile.am
++++ b/extensions/Exporters/SmugMugExport/Makefile.am
+@@ -31,7 +31,7 @@ RESOURCES =				\
+ 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+ 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
+ 
+-SUBDIRS =                      \
++SUBDIR =                      \
+ 	SmugMugNet
+ 
+ 
+@@ -41,7 +41,7 @@ mpack: $(PLUGIN_ASSEMBLY)
+ 	mautil p $(PLUGIN_ASSEMBLY)
+ 
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+-	$(MAKE) -C $(SUBDIRS)
++	$(MAKE) -C $(SUBDIR)
+ 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+ 
+ plugindir = $(pkglibdir)/extensions
+diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
+index b7465d6..acf2d24 100644
+--- a/extensions/Exporters/TabbloExport/Makefile.am
++++ b/extensions/Exporters/TabbloExport/Makefile.am
+@@ -36,7 +36,7 @@ PKGS = \
+ 	-pkg:gtk-sharp-2.0 \
+ 	-pkg:glade-sharp-2.0 
+ 
+-SUBDIRS = \
++SUBDIR = \
+ 	Tabblo
+ 
+ RESOURCES = \
+@@ -50,7 +50,7 @@ mpack: $(PLUGIN_ASSEMBLY)
+ 	mautil p $(PLUGIN_ASSEMBLY)
+ 
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+-	$(MAKE) -C $(SUBDIRS)
++	$(MAKE) -C $(SUBDIR)
+ 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+ 
+ plugindir = $(pkglibdir)/extensions
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 02add7d..ba9bcaf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
+ 
+ FSpot.Bling.dll.mdb: FSpot.Bling.dll
+ 
+-FSpot.Bling.dll: $(BLING_CSFILES)
++FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
+ 	@echo -e "\n*** Compiling $@"
+ 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
+ 
+ FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
+ 
+-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
++FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
+ 	@echo -e "\n*** Compiling $@"
+ 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
+ 
+--
+cgit v0.8.2