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

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

5 files changed, 126 insertions, 3 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/Manifest b/media-gfx/f-spot/Manifest
index 3bbf7c6fb86b..cf6c9da26dcf 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX f-spot-0.5.0.3-icon-size-crash-fix.patch 1646 RMD160 bb6144678b2ba8b256e9bab3dae86109ae3e2e76 SHA1 4171c56939e4e7585a65133e697d66d19a1636e0 SHA256 dc4412f58e059c9c006aef49f389e6d1c4088c5f7dc0748e8e8c95fd6ef78db3
 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.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 7543 RMD160 cfe0e9b7912b7298c942c7a8412e8626042a6eaa SHA1 eb54ab3f6ef5d57bae763e00c3156b40c6003a50 SHA256 84b3ba5896a594f9f35e87979ae62901cfa0efbe72eacf01b7a62e0668acf2d3
-MISC metadata.xml 453 RMD160 8a36645394c05be09a3f1c607b2f369cc5dc00a4 SHA1 84e3d45c42c0806302316b7038267e77b07f2927 SHA256 6b85e2644101d885cfed3e808c4bfff4f9a7065933e08e739c46baf4502ad8d0
+MISC ChangeLog 7827 RMD160 682cf9cb1c4c219039cfd00daf740fe5e01dd51d SHA1 7db0b04e5d80246ed00c228777253548586fa1ce SHA256 0b4d42c28486b139aa8f43390bd3ffe2379acdec6ffad3dfa0a8ead8f03998aa
+MISC metadata.xml 522 RMD160 d85cdf5feec0044ac650f1c9904cdffff73f3e8c SHA1 6d9625420a2a3cbfe056f613d66259cb5e5a00dd SHA256 a8ecf54ebf5a2c0ffcfd9aac5a8e237cac7bb04681427ab16ce9c1eaddbd0ce2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqo8F8ACgkQAiZjviIA2XgNXgCfcCJIwYPhnysXqS7p/fFEx7lB
+ESUAoJt5VbwueR57pBgqeTFxqZpxGo6K
+=jDQt
+-----END PGP SIGNATURE-----
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>