Revision bump to fix installation (the parallel build “fix” caused the bundled libraries not to be installed); -r2 bundles FlickrNet, -r3 uses the system copy and may disable the Flickr exporter.

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

6 files changed, 41 insertions, 174 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 4d30d6ded238..6679a082d81f 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,18 @@
 # 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.42 2009/09/10 12:25:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.43 2009/09/12 23:25:10 flameeyes Exp $
+
+*f-spot-0.6.1.1-r3 (12 Sep 2009)
+*f-spot-0.6.1.1-r2 (12 Sep 2009)
+
+  12 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -f-spot-0.6.1.1.ebuild, -f-spot-0.6.1.1-r1.ebuild,
+  +f-spot-0.6.1.1-r2.ebuild, +f-spot-0.6.1.1-r3.ebuild,
+  -files/f-spot-0.6.1.1-parallel-build.patch,
+  -files/f-spot-0.6.1.1-use-system-flickrnet.patch:
+  Revision bump to fix installation (the parallel build “fix” caused the
+  bundled libraries not to be installed); -r2 bundles FlickrNet, -r3 uses
+  the system copy and may disable the Flickr exporter.
 
 *f-spot-0.6.1.1-r1 (10 Sep 2009)
 
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index cf6c9da26dcf..2ad9977c3e65 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -5,21 +5,20 @@ 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
-AUX f-spot-0.6.1.1-use-system-flickrnet.patch 943 RMD160 fc6c02a594997b2c911e4babca4d5d5681699644 SHA1 d4bf8755e64c2cb7a6628494d5f4e7e8de1ff688 SHA256 4f9089590d7f55ab3a41e8f8a9f4d301e41a7c3505a1f3050357dd11b8af8499
 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-gentoo-1.tar.bz2 4020 RMD160 0804c65cf35443e993e53182b9fe3b431df41aa2 SHA1 8ec500037a80c5a839209bacdde1956a14a3a1a7 SHA256 7934cdd201773d47d6496f64a2c4fd42463931c6d4f1712aa514f6537dea8da5
 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-r1.ebuild 1883 RMD160 787d334ca9e817ec9d0b2124ddea61fcee1f0dd5 SHA1 f93eb9c2c567d8d7dbc94c6f9cc536c9d5d12056 SHA256 2f2ed0728e17e8da03b727d92e09956b2da36701ef0bce419c511deba53f4354
-EBUILD f-spot-0.6.1.1.ebuild 1700 RMD160 dc203b80920c5ca5f56e60fbba4033817e2b23b9 SHA1 5993aec79b0c2b732bee17d099847a7da49704d7 SHA256 71610ab932c8f6a3ed58efff143daf6fefedc9579129f2bbda773ac669de5c31
-MISC ChangeLog 7827 RMD160 682cf9cb1c4c219039cfd00daf740fe5e01dd51d SHA1 7db0b04e5d80246ed00c228777253548586fa1ce SHA256 0b4d42c28486b139aa8f43390bd3ffe2379acdec6ffad3dfa0a8ead8f03998aa
+EBUILD f-spot-0.6.1.1-r2.ebuild 1726 RMD160 de10eca53c4b190b4f5cc2205877a19a19299481 SHA1 4c2968874e813a003980ca44a384c0ed0c615a56 SHA256 14c19a3d7f87f79cf6001304bf1759af2833b1ed539ac72dbfd6ef724316a47b
+EBUILD f-spot-0.6.1.1-r3.ebuild 1923 RMD160 6ed69a8f2f3bb886a357225e6789b0893f3a3f71 SHA1 30e2951741bec6e86b44c75319b96b9de29cf9a0 SHA256 7bdcfa4ae53afe43300cdf801341714996b73e177def3e8ddb283add1ac17582
+MISC ChangeLog 8364 RMD160 46df12fbd646a804a4af834da755c93f921f44be SHA1 c1633a7833a841755d55f244741d09351a89aa8a SHA256 c8fa3e1e9aadd77fda90135ab5554be344245116c81bcfb5366fe5557a527253
 MISC metadata.xml 522 RMD160 d85cdf5feec0044ac650f1c9904cdffff73f3e8c SHA1 6d9625420a2a3cbfe056f613d66259cb5e5a00dd SHA256 a8ecf54ebf5a2c0ffcfd9aac5a8e237cac7bb04681427ab16ce9c1eaddbd0ce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqo8F8ACgkQAiZjviIA2XgNXgCfcCJIwYPhnysXqS7p/fFEx7lB
-ESUAoJt5VbwueR57pBgqeTFxqZpxGo6K
-=jDQt
+iEYEARECAAYFAkqsLd0ACgkQAiZjviIA2Xj0FACfS1J/vEyeXzqJIghs416c1RtH
+ylQAoO/ql9Q+rxRwpEexEuqaXndAF3XU
+=Xd1w
 -----END PGP SIGNATURE-----
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-r2.ebuild
index 01b0b06227e1..252da6b13dfd 100644
--- a/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
+++ b/media-gfx/f-spot/f-spot-0.6.1.1-r2.ebuild
@@ -1,9 +1,11 @@
 # 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.2 2009/08/27 21:24:07 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.6.1.1-r2.ebuild,v 1.1 2009/09/12 23:25:10 flameeyes Exp $
 
 EAPI=2
 
+GENTOO_PATCHLEVEL=1
+
 inherit gnome2 mono eutils autotools
 
 DESCRIPTION="Personal photo management application for the gnome desktop"
@@ -42,15 +44,19 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35"
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-gentoo-${GENTOO_PATCHLEVEL}.tar.bz2"
+
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
 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
+
+	epatch "${WORKDIR}/${P}-patches/"*
+
 	eautoreconf
 }
 
diff --git a/media-gfx/f-spot/f-spot-0.6.1.1-r1.ebuild b/media-gfx/f-spot/f-spot-0.6.1.1-r3.ebuild
index 02c316ee0b75..fa4f39fb4fdd 100644
--- a/media-gfx/f-spot/f-spot-0.6.1.1-r1.ebuild
+++ b/media-gfx/f-spot/f-spot-0.6.1.1-r3.ebuild
@@ -1,10 +1,12 @@
 # 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-r1.ebuild,v 1.1 2009/09/10 12:25:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.6.1.1-r3.ebuild,v 1.1 2009/09/12 23:25:10 flameeyes Exp $
 
 EAPI=2
 
-inherit gnome2 mono eutils autotools
+GENTOO_PATCHLEVEL=1
+
+inherit gnome2 mono eutils autotools multilib
 
 DESCRIPTION="Personal photo management application for the gnome desktop"
 HOMEPAGE="http://f-spot.org"
@@ -43,19 +45,20 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35"
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-gentoo-${GENTOO_PATCHLEVEL}.tar.bz2"
+
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
 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
 
-	if use flickr; then
-		epatch "${FILESDIR}/${P}-use-system-flickrnet.patch"
-	else
+	epatch "${WORKDIR}/${P}-patches/"*
+
+	if ! use flickr; then
 		sed -i -e '/FlickrExport/d' extensions/Exporters/Makefile.am || die
 	fi
 
@@ -63,7 +66,8 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure --disable-static --disable-scrollkeeper
+	gnome2_src_configure --disable-static --disable-scrollkeeper \
+		--with-flickrnet=/usr/$(get_libdir)/mono/FlickrNet/FlickrNet.dll
 }
 
 src_install() {
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
deleted file mode 100644
index efd651f23073..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.6.1.1-parallel-build.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-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
diff --git a/media-gfx/f-spot/files/f-spot-0.6.1.1-use-system-flickrnet.patch b/media-gfx/f-spot/files/f-spot-0.6.1.1-use-system-flickrnet.patch
deleted file mode 100644
index 6a24d3dbb7ce..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.6.1.1-use-system-flickrnet.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: f-spot-0.6.1.1/extensions/Exporters/FlickrExport/Makefile.am
-===================================================================
---- f-spot-0.6.1.1.orig/extensions/Exporters/FlickrExport/Makefile.am
-+++ f-spot-0.6.1.1/extensions/Exporters/FlickrExport/Makefile.am
-@@ -20,16 +20,13 @@ REFS =					\
- 	$(LINK_GIOSHARP)				\
- 	$(LINK_GTKSHARPBEANS)		\
- 	$(LINK_DBUS)				\
--	-r:FlickrNet/FlickrNet.dll	\
-+	-r:/usr/lib/mono/FlickrNet/FlickrNet.dll	\
- 	-r:Mono.Posix
- 
- PKGS =					\
- 	-pkg:gtk-sharp-2.0		\
- 	-pkg:glade-sharp-2.0
- 
--SUBDIR = 			\
--	FlickrNet
--
- RESOURCES =				\
- 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
- 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -40,7 +37,6 @@ mpack: $(PLUGIN_ASSEMBLY)
- 	mautil p $(PLUGIN_ASSEMBLY)
- 
- $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
--	$(MAKE) -C $(SUBDIR)
- 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
- 
- plugindir = $(pkglibdir)/extensions