Fix flickr exporter (bug #283398 and more) by building against the system copy of flickrnet.

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

4 files changed, 112 insertions, 1 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 28b08fcd8663..4d30d6ded238 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,14 @@
 # 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.41 2009/08/27 21:24:07 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.42 2009/09/10 12:25:55 flameeyes Exp $
+
+*f-spot-0.6.1.1-r1 (10 Sep 2009)
+
+  10 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +f-spot-0.6.1.1-r1.ebuild,
+  +files/f-spot-0.6.1.1-use-system-flickrnet.patch, metadata.xml:
+  Fix flickr exporter (bug #283398 and more) by building against the system
+  copy of flickrnet.
 
   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:
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-r1.ebuild
new file mode 100644
index 000000000000..02c316ee0b75
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.6.1.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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 $
+
+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"
+IUSE="beagle flickr"
+
+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
+	flickr? ( dev-dotnet/flickrnet-bin )"
+
+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"
+
+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
+		sed -i -e '/FlickrExport/d' extensions/Exporters/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static --disable-scrollkeeper
+}
+
+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.6.1.1-use-system-flickrnet.patch b/media-gfx/f-spot/files/f-spot-0.6.1.1-use-system-flickrnet.patch
new file mode 100644
index 000000000000..6a24d3dbb7ce
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.6.1.1-use-system-flickrnet.patch
@@ -0,0 +1,30 @@
+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
diff --git a/media-gfx/f-spot/metadata.xml b/media-gfx/f-spot/metadata.xml
index f8bf6ca49efb..23342b9fab36 100644
--- a/media-gfx/f-spot/metadata.xml
+++ b/media-gfx/f-spot/metadata.xml
@@ -11,6 +11,7 @@
 	</longdescription>
 	<use>
 		<flag name="beagle">Enable app-misc/beagle support for searches</flag>
+		<flag name="flickr">Enable building of the Flickr exported.</flag>
 	</use>
 </pkgmetadata>