Version bump including a patch for compiling against mono-2.8 (bug #345409 Damien Thébault), remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

10 files changed, 108 insertions, 425 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 4c5529f486c7..6c91743d7ca9 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/f-spot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.47 2010/10/01 19:40:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.48 2010/12/19 20:12:55 pacho Exp $
+
+*f-spot-0.8.2 (19 Dec 2010)
+
+  19 Dec 2010; Pacho Ramos <pacho@gentoo.org> -f-spot-0.5.0.3-r1.ebuild,
+  -files/f-spot-0.5.0.3-icon-size-crash-fix.patch,
+  -files/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch,
+  -f-spot-0.6.0.0.ebuild, -files/f-spot-0.6.0.0-parallel-build.patch,
+  -files/f-spot-0.6.0.0-sandbox-violation.patch, -f-spot-0.6.1.1-r2.ebuild,
+  +files/f-spot-0.8.1-mono2.8.patch, +f-spot-0.8.2.ebuild:
+  Version bump including a patch for compiling against mono-2.8 (bug #345409
+  Damien Thébault), remove old.
 
 *f-spot-0.8.0 (01 Oct 2010)
 
diff --git a/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild b/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild
deleted file mode 100644
index 398d41ffdaf5..000000000000
--- a/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.5.0.3-r1.ebuild,v 1.4 2009/06/01 17:28:26 loki_val Exp $
-
-EAPI=2
-
-inherit gnome2 mono eutils
-
-DESCRIPTION="Personal photo management application for the gnome desktop"
-HOMEPAGE="http://f-spot.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	>=dev-dotnet/gtk-sharp-2.12.0
-	>=dev-dotnet/glade-sharp-2.12.0
-	>=dev-dotnet/dbus-sharp-0.4.2
-	>=dev-dotnet/dbus-glib-sharp-0.3.0
-	>=dev-dotnet/gtkhtml-sharp-2.7
-	>=dev-dotnet/gconf-sharp-2.7
-	>=dev-dotnet/gnomevfs-sharp-2.7
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=media-libs/libexif-0.6.16
-	<media-libs/libexif-0.7.0
-	>=media-libs/libgphoto2-2.1.4
-	>=media-libs/lcms-1.15
-	media-libs/jpeg
-	>=dev-db/sqlite-3"
-
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# See bug #203566
-RESTRICT="test"
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# Prevent scrollkeeper access violations
-	gnome2_omf_fix
-
-	# Run libtoolize
-	elibtoolize ${ELTCONF}
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=252636
-	# http://bugzilla.gnome.org/565733
-	sed -i -e '/rm \-f $(pl/d' \
-		$(
-			grep -lr --include='Makefile.in' \
-			'rm -f \$(pl' "${S}"/extensions/Exporters
-		) || die "sed failed"
-	epatch "${FILESDIR}"/f-spot-0.5.0.3-icon-size-crash-fix.patch
-	epatch "${FILESDIR}"/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_compile () {
-	default
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/media-gfx/f-spot/f-spot-0.6.0.0.ebuild b/media-gfx/f-spot/f-spot-0.6.0.0.ebuild
deleted file mode 100644
index 9f39d856b514..000000000000
--- a/media-gfx/f-spot/f-spot-0.6.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.0.0.ebuild,v 1.4 2009/08/27 21:16:25 loki_val Exp $
-
-EAPI=2
-
-inherit gnome2 mono eutils autotools
-
-DESCRIPTION="Personal photo management application for the gnome desktop"
-HOMEPAGE="http://f-spot.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="beagle"
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=media-libs/libexif-0.6.16
-	<media-libs/libexif-0.7.0
-	>=dev-dotnet/gtk-sharp-2.12.2
-	>=dev-dotnet/glib-sharp-2.12.2
-	>=dev-dotnet/glade-sharp-2.12.2
-	>=dev-dotnet/gnomevfs-sharp-2.12.2
-	>=x11-libs/gtk+-2.14
-	>=dev-libs/glib-2.16
-	>=dev-dotnet/gnome-sharp-2.8
-	>=dev-dotnet/glib-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.12.2
-	beagle? ( >=app-misc/beagle-0.3.0 )
-	>=dev-libs/dbus-glib-0.71
-	>=dev-dotnet/dbus-sharp-0.4.2
-	>=dev-dotnet/dbus-glib-sharp-0.3.0
-	media-libs/jpeg
-	>=media-libs/lcms-1.12
-	>=media-libs/libgphoto2-2.1.4
-	>=dev-db/sqlite-3"
-
-DEPEND="${RDEPEND}
-	>=dev-dotnet/gtk-sharp-gapi-2.12.2
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-MAKEOPTS="${MAKEOPTS} -j1" #281242
-
-SCROLLKEEPER_UPDATE=0
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-parallel-build.patch"
-	epatch "${FILESDIR}/${P}-sandbox-violation.patch"
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static --disable-scrollkeeper
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/media-gfx/f-spot/f-spot-0.6.1.1-r2.ebuild b/media-gfx/f-spot/f-spot-0.6.1.1-r2.ebuild
deleted file mode 100644
index 252da6b13dfd..000000000000
--- a/media-gfx/f-spot/f-spot-0.6.1.1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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-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"
-HOMEPAGE="http://f-spot.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="beagle"
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=media-libs/libexif-0.6.16
-	<media-libs/libexif-0.7.0
-	>=dev-dotnet/gtk-sharp-2.12.2
-	>=dev-dotnet/glib-sharp-2.12.2
-	>=dev-dotnet/glade-sharp-2.12.2
-	>=dev-dotnet/gnomevfs-sharp-2.12.2
-	>=x11-libs/gtk+-2.14
-	>=dev-libs/glib-2.16
-	>=dev-dotnet/gnome-sharp-2.8
-	>=dev-dotnet/glib-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.12.2
-	beagle? ( >=app-misc/beagle-0.3.0 )
-	>=dev-libs/dbus-glib-0.71
-	>=dev-dotnet/dbus-sharp-0.4.2
-	>=dev-dotnet/dbus-glib-sharp-0.3.0
-	media-libs/jpeg
-	>=media-libs/lcms-1.12
-	>=media-libs/libgphoto2-2.1.4
-	>=dev-db/sqlite-3"
-
-DEPEND="${RDEPEND}
-	>=dev-dotnet/gtk-sharp-gapi-2.12.2
-	app-text/gnome-doc-utils
-	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() {
-	sed  -r -i -e 's:-D[A-Z]+_DISABLE_DEPRECATED::g' \
-		lib/libfspot/Makefile.am
-
-	epatch "${WORKDIR}/${P}-patches/"*
-
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static --disable-scrollkeeper
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/media-gfx/f-spot/f-spot-0.8.2.ebuild b/media-gfx/f-spot/f-spot-0.8.2.ebuild
new file mode 100644
index 000000000000..8efd4eef0399
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.8.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 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.8.2.ebuild,v 1.1 2010/12/19 20:12:55 pacho Exp $
+
+EAPI="2"
+
+inherit gnome2 mono eutils autotools multilib
+
+DESCRIPTION="Personal photo management application for the gnome desktop"
+HOMEPAGE="http://f-spot.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc flickr raw"
+
+RDEPEND=">=dev-lang/mono-2.2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	dev-dotnet/gnome-keyring-sharp
+	>=dev-dotnet/gtk-sharp-2.12.2
+	>=dev-dotnet/glib-sharp-2.12.2
+	>=x11-libs/gtk+-2.16
+	>=dev-libs/glib-2.22
+	>=dev-libs/libunique-1.0
+	>=dev-dotnet/gnome-sharp-2.8
+	>=dev-dotnet/glib-sharp-2.12
+	>=dev-dotnet/gconf-sharp-2.20.2
+	>=dev-dotnet/mono-addins-0.3
+	>=dev-libs/dbus-glib-0.71
+	>=dev-dotnet/dbus-sharp-0.4.2
+	>=dev-dotnet/dbus-glib-sharp-0.3.0
+	>=media-libs/lcms-1.12:0
+	>=x11-libs/cairo-1.4
+	doc? (	virtual/monodoc
+		>=app-text/gnome-doc-utils-0.17.3 )
+	flickr? ( >=dev-dotnet/flickrnet-bin-2.2-r1 )
+	raw?	( media-gfx/dcraw )"
+
+DEPEND="${RDEPEND}
+	>=dev-dotnet/gtk-sharp-gapi-2.12.2
+	>=app-text/gnome-doc-utils-0.17.3
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		$(use_enable doc user-help)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compiler error CS1501 building FSpot.Loaders on mono 2.8, upstream bug #629224
+	epatch "${FILESDIR}/${PN}-0.8.1-mono2.8.patch"
+
+	sed  -r -i -e 's:-D[A-Z]+_DISABLE_DEPRECATED::g' \
+		lib/libfspot/Makefile.am || die
+
+	if ! use flickr; then
+		sed -i -e '/FSpot.Exporters.Flickr/d' src/Extensions/Exporters/Makefile.am || die
+		sed -i -e '/FSPOT_CHECK_FLICKRNET/d' configure.ac || die
+	fi
+
+	intltoolize --force --automake --copy || die "intltoolized failed"
+	AT_M4DIR="build/m4/f-spot build/m4/shamrock build/m4/shave" eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name '*.la' -delete || die "la removal failed"
+}
diff --git a/media-gfx/f-spot/files/f-spot-0.5.0.3-icon-size-crash-fix.patch b/media-gfx/f-spot/files/f-spot-0.5.0.3-icon-size-crash-fix.patch
deleted file mode 100644
index 6bdf3610d7e8..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.5.0.3-icon-size-crash-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=248634
-http://bugzilla.gnome.org/show_bug.cgi?id=557793
-
-
-From efe65ac1c3ee8f3d01afaa57425926d9390b747a Mon Sep 17 00:00:00 2001
-From: sdelcroix <sdelcroix@772769d8-d925-0410-89eb-a6ffa0d40526>
-Date: Wed, 5 Nov 2008 07:59:27 +0000
-Subject: [PATCH] 2008-11-05  Stephane Delcroix  <sdelcroix@novell.com>
-
-	* src/TagSelectionWidget.cs:
-	* src/Core/Tag.cs: fix for bgo 557793
-
-git-svn-id: svn+ssh://svn.gnome.org/svn/f-spot/branches/FSPOT_0_5_0_STABLE@4572 772769d8-d925-0410-89eb-a6ffa0d40526
----
- src/Core/Tag.cs           |    3 +++
- src/TagSelectionWidget.cs |    2 +-
- 3 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/src/Core/Tag.cs b/src/Core/Tag.cs
-index 42b671a..75b2d3d 100644
---- src/Core/Tag.cs
-+++ src/Core/Tag.cs
-@@ -108,6 +108,9 @@ namespace FSpot
- 					if (Math.Max (cached_icon.Width, cached_icon.Height) <= (int) tag_icon_size) 
- 						return cached_icon;
- 				}
-+				if (icon == null)
-+					return null;
-+
- 				if (Math.Max (icon.Width, icon.Height) >= (int) tag_icon_size) { //Don't upscale
- 					if (cached_icon != null)
- 						cached_icon.Dispose ();
-diff --git a/src/TagSelectionWidget.cs b/src/TagSelectionWidget.cs
-index 515dc2a..3516c58 100644
---- src/TagSelectionWidget.cs
-+++ src/TagSelectionWidget.cs
-@@ -192,7 +192,7 @@ public class TagSelectionWidget : FSpot.Widgets.SaneTreeView {
- 		SetBackground (renderer, tag);
- 
- 		// FIXME I can't set the Pixbuf to null, not sure if it's a GTK# bug...
--		if (tag.Icon != null) {
-+		if (tag.SizedIcon != null) {
- 			if (FSpot.ColorManagement.IsEnabled) {
- 				//FIXME
- 				Gdk.Pixbuf temp = tag.SizedIcon.Copy();
--- 
-1.6.0.2
-
diff --git a/media-gfx/f-spot/files/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch b/media-gfx/f-spot/files/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch
deleted file mode 100644
index bd6cdb78ad04..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=248633
-http://bugzilla.gnome.org/show_bug.cgi?id=556395
-
-Index: src/Widgets/Filmstrip.cs
-===================================================================
---- src/Widgets/Filmstrip.cs	(revisione 4485)
-+++ src/Widgets/Filmstrip.cs	(copia locale)
-@@ -372,6 +372,9 @@
- 			if (evnt.Window != GdkWindow)
- 				return true;
- 
-+			if (selection.Collection.Count == 0)
-+				return true;
-+
- 			if (extendable && Allocation.Width >= BackgroundPixbuf.Width + (2 * x_offset) + BackgroundTile.Width)
- 				BackgroundPixbuf = null;
- 
diff --git a/media-gfx/f-spot/files/f-spot-0.6.0.0-parallel-build.patch b/media-gfx/f-spot/files/f-spot-0.6.0.0-parallel-build.patch
deleted file mode 100644
index 68cae604adfe..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.6.0.0-parallel-build.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From be3757a0924a4f56390e979e7feed7c163779f6a Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
-Date: Sat, 8 Aug 2009 13:03:56 +0200
-Subject: [PATCH 03/19] Fix parallel build issue, "make -j2" now works
-
----
- src/Makefile.am |   18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index dc2f8ea..5bafde7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -473,30 +473,44 @@ NULL_PLATFORM_CSFILES = $(NULL_PLATFROM_CSDISTFILES)
- F_SPOT_CSFILES = $(F_SPOT_CSDISTFILES)	\
- 	AssemblyInfo.cs
- 
-+Cms.dll.mdb: Cms.dll
-+
- Cms.dll: $(CMS_CSFILES)
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UNSAFE) $(CMS_CSFILES) $(CMS_ASSEMBLIES)
- 
-+FSpot.Core.dll.mdb: FSpot.Core.dll
-+
- FSpot.Core.dll: $(CORE_CSFILES) FSpot.Utils.dll Cms.dll
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(CORE_CSFILES) $(CORE_ASSEMBLIES)
- 
-+FSpot.Query.dll.mdb: FSpot.Query.dll
-+
- FSpot.Query.dll: $(QUERY_CSFILES) FSpot.Utils.dll FSpot.Core.dll
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(QUERY_CSFILES) $(QUERY_ASSEMBLIES)
- 
-+FSpot.Utils.dll.mdb: FSpot.Utils.dll
-+
- FSpot.Utils.dll: $(UTILS_CSFILES)
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UTILS_CSFILES) $(UTILS_ASSEMBLIES)
- 
-+FSpot.JobScheduler.dll.mdb: FSpot.JobScheduler.dll
-+
- FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(JOBSCHEDULER_CSFILES) $(JOBSCHEDULER_ASSEMBLIES)
- 
-+FSpot.Bling.dll.mdb: FSpot.Bling.dll
-+
- FSpot.Bling.dll: $(BLING_CSFILES)
- 	@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
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
-@@ -504,10 +518,14 @@ FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
- PLATFORM_CSFILES = $(GNOME_PLATFORM_CSFILES)
- PLATFORM_ASSEMBLIES = $(GNOME_PLATFORM_ASSEMBLIES)
- 
-+FSpot.Platform.dll.mdb: FSpot.Platform.dll
-+
- FSpot.Platform.dll: $(PLATFORM_CSFILES) FSpot.Utils.dll
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(PLATFORM_CSFILES) $(PLATFORM_ASSEMBLIES)
- 
-+f-spot.exe.mdb: f-spot.exe
-+
- f-spot.exe: $(F_SPOT_CSFILES) FSpot.Utils.dll FSpot.Core.dll FSpot.Query.dll FSpot.JobScheduler.dll FSpot.Bling.dll FSpot.Widgets.dll Cms.dll FSpot.Platform.dll $(F_SPOT_RESOURCES)
- 	@echo -e "\n*** Compiling $@"
- 	$(CSC) -target:winexe -out:$@ $(EXTRAFLAGS) $(UNSAFE) $(NOWARN) $(NUNIT_DEFINES) $(F_SPOT_CSFILES) $(F_SPOT_ASSEMBLIES) $(RESOURCES)
--- 
-1.6.3.3
-
diff --git a/media-gfx/f-spot/files/f-spot-0.6.0.0-sandbox-violation.patch b/media-gfx/f-spot/files/f-spot-0.6.0.0-sandbox-violation.patch
deleted file mode 100644
index 73469dca89de..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.6.0.0-sandbox-violation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 82322bb8461eca5a06e2ec05a5705bc52fada244 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Mon, 10 Aug 2009 14:03:38 -0400
-Subject: [PATCH 19/19] Make install-data-hook respect DESTDIR
-
----
- extensions/Exporters/FlickrExport/Makefile.am    |    2 +-
- extensions/Exporters/PicasaWebExport/Makefile.am |    2 +-
- extensions/Exporters/SmugMugExport/Makefile.am   |    2 +-
- extensions/Exporters/TabbloExport/Makefile.am    |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
-index 2535352..46c70e6 100644
---- a/extensions/Exporters/FlickrExport/Makefile.am
-+++ b/extensions/Exporters/FlickrExport/Makefile.am
-@@ -45,7 +45,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- plugindir = $(pkglibdir)/extensions
- 
- install-data-hook:
--	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
-+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
- 
- plugin_DATA =			\
- 	$(PLUGIN_ASSEMBLY)
-diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
-index 4b39ee2..25d0322 100644
---- a/extensions/Exporters/PicasaWebExport/Makefile.am
-+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
-@@ -46,7 +46,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- plugindir = $(pkglibdir)/extensions
- 
- install-data-hook:
--	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
-+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
- 
- plugin_DATA =			\
- 	$(PLUGIN_ASSEMBLY)
-diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
-index 5e2d8b6..bed9b68 100644
---- a/extensions/Exporters/SmugMugExport/Makefile.am
-+++ b/extensions/Exporters/SmugMugExport/Makefile.am
-@@ -46,7 +46,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- plugindir = $(pkglibdir)/extensions
- 
- install-data-hook:
--	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
-+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
- 
- plugin_DATA =			\
- 	$(PLUGIN_ASSEMBLY)
-diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
-index b4ffd33..233ba73 100644
---- a/extensions/Exporters/TabbloExport/Makefile.am
-+++ b/extensions/Exporters/TabbloExport/Makefile.am
-@@ -55,7 +55,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- plugindir = $(pkglibdir)/extensions
- 
- install-data-hook:
--	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
-+	-rm -f "$(DESTDIR)$(plugindir)/$(PLUGIN_NAME).addin.xml"
- 
- plugin_DATA =			\
- 	$(PLUGIN_ASSEMBLY)
--- 
-1.6.3.3
-
diff --git a/media-gfx/f-spot/files/f-spot-0.8.1-mono2.8.patch b/media-gfx/f-spot/files/f-spot-0.8.1-mono2.8.patch
new file mode 100644
index 000000000000..80e5636ac9aa
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.8.1-mono2.8.patch
@@ -0,0 +1,22 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack <grendel@twistedcode.net>
+Date: Wed, 15 Sep 2010 21:21:52 +0000
+Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload which takes a boolean parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629224
+---
+diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+index 2eea50e..9c9c07a 100644
+--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
+ 		public new bool Close ()
+ 		{
+ 			lock (sync_handle) {
+-				return base.Close (true);
++				return base.Close ();
+ 			}
+ 		}
+ #endregion
+--
+cgit v0.8.3.1