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.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

5 files changed, 34 insertions, 166 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/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