New version with bugfixes. Now works with newer versions of libexif and has a patch to prevent cpu spike when exporting

(Portage version: 2.1.2-r6)

5 files changed, 126 insertions, 4 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 88c9a5b094c3..f42296934f69 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.15 2007/01/24 06:36:20 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.16 2007/02/12 23:29:37 joem Exp $
+
+*f-spot-0.3.3 (12 Feb 2007)
+
+  12 Feb 2007; Joe McCann <joem@gentoo.org>
+  +files/f-spot-0.3.3-dont_eat_cpu.patch, f-spot-0.3.2.ebuild,
+  +f-spot-0.3.3.ebuild:
+  New version with bugfixes. Now works with newer versions of libexif and has
+  a patch to prevent cpu spike when exporting
 
 *f-spot-0.3.2 (24 Jan 2007)
 
diff --git a/media-gfx/f-spot/f-spot-0.3.2.ebuild b/media-gfx/f-spot/f-spot-0.3.2.ebuild
index 34db0f887da9..d59f68962d6b 100644
--- a/media-gfx/f-spot/f-spot-0.3.2.ebuild
+++ b/media-gfx/f-spot/f-spot-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.2.ebuild,v 1.1 2007/01/24 06:36:20 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.3.2.ebuild,v 1.2 2007/02/12 23:29:37 joem Exp $
 
 inherit gnome2 mono eutils autotools
 
@@ -53,9 +53,11 @@ src_unpack()
 	unpack ${A}
 	cd ${S}
 
-	# Gentoo uses older EXIF so name for now
+	# Gentoo used old so version until libexif-0.6.13-r2
+	if has_version "<media-libs/libexif-0.6.13-r2";
+	then
 	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
+	fi
 	# Multilib fix
 	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
 		configure.in || die "sed failed"
diff --git a/media-gfx/f-spot/f-spot-0.3.3.ebuild b/media-gfx/f-spot/f-spot-0.3.3.ebuild
new file mode 100644
index 000000000000..2175c21de2aa
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.3.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 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.3.3.ebuild,v 1.1 2007/02/12 23:29:37 joem Exp $
+
+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=""
+
+RDEPEND=">=dev-lang/mono-1.1.10
+|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.6
+	>=dev-dotnet/gtk-sharp-2.7
+	>=dev-dotnet/gtkhtml-sharp-2.7
+	>=dev-dotnet/gconf-sharp-2.7
+	>=dev-dotnet/glade-sharp-2.7
+	>=dev-dotnet/gnomevfs-sharp-2.7
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=media-libs/libexif-0.6
+	<media-libs/libexif-0.7.0
+	>=media-libs/libgphoto2-2.1.4
+	>=media-libs/lcms-1.14
+	media-libs/jpeg
+	>=dev-db/sqlite-3"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+#pkg_setup()
+#{
+	#if ! built_with_use sys-apps/dbus mono ; then
+	#	echo
+	#	eerror "In order to compile f-spot, you need to have sys-apps/dbus emerged"
+	#	eerror "with 'mono' in your USE flags. Please add that flag, re-emerge"
+	#	eerror "dbus, and then emerge f-spot."
+	#	die "sys-apps/dbus is missing the .NET binding."
+	#fi
+#}
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-dont_eat_cpu.patch
+	# Gentoo used old so version until libexif-0.6.13-r2
+	if has_version "<media-libs/libexif-0.6.13-r2";
+	then
+	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
+	fi
+	# Multilib fix
+	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
+		configure.in || die "sed failed"
+
+	#older versions put headers in wrong spot, see #100269
+	if has_version "<=media-libs/lcms-1.13-r1" || has_version "=media-libs/lcms-1.14"; then
+		sed -i "s:lcms.h:lcms/lcms.h:" ${S}/configure.in || die "sed failed"
+		sed -i "s:lcms.h:lcms/lcms.h:" ${S}/libeog/image-view.c || die "sed failed"
+	fi
+
+	eautoconf || die "autoconf failed"
+}
+
diff --git a/media-gfx/f-spot/files/digest-f-spot-0.3.3 b/media-gfx/f-spot/files/digest-f-spot-0.3.3
new file mode 100644
index 000000000000..906c4e4cc664
--- /dev/null
+++ b/media-gfx/f-spot/files/digest-f-spot-0.3.3
@@ -0,0 +1,3 @@
+MD5 c1f26fd63e5e43c3e2d4bb6639377565 f-spot-0.3.3.tar.bz2 1748891
+RMD160 7f0e7599c5338b82e94f9e0ddf3ddbd4ec187344 f-spot-0.3.3.tar.bz2 1748891
+SHA256 318af2ab4bb4fba06894bdb1b538197fdb6daefa7b0b6830350a8168b0b501ad f-spot-0.3.3.tar.bz2 1748891
diff --git a/media-gfx/f-spot/files/f-spot-0.3.3-dont_eat_cpu.patch b/media-gfx/f-spot/files/f-spot-0.3.3-dont_eat_cpu.patch
new file mode 100644
index 000000000000..b2156b205580
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.3.3-dont_eat_cpu.patch
@@ -0,0 +1,35 @@
+--- src/ThreadProgressDialog.cs	2007/02/01 19:28:01	2906
++++ src/ThreadProgressDialog.cs	2007/02/11 19:23:05	2946
+@@ -132,9 +132,11 @@
+ 			}
+ 		}
+ 
++		private bool retry_skip;
+ 		private bool RetrySkipVisible {
+ 			set { 
+-				retry_button.Visible = skip_button.Visible = value;
++				retry_skip = value;
++				delay.Start ();
+ 			} 
+ 		}
+ 
+@@ -149,7 +151,7 @@
+ 
+ 			RetrySkipVisible = false;
+ 
+-			return error_response == Gtk.ResponseType.Yes ? true : false;
++			return (error_response == Gtk.ResponseType.Yes);
+ 		}
+ 
+ 		private void HandleResponse (object obj, Gtk.ResponseArgs args) {
+@@ -162,8 +164,9 @@
+ 			progress_bar.Text = progress_text;
+ 			progress_bar.Fraction = System.Math.Min (1.0, System.Math.Max (0.0, fraction));
+ 			button.Label = button_label;
++			retry_button.Visible = skip_button.Visible = retry_skip;
+ 
+-			return true;
++			return false;
+ 		}
+ 
+ 		private void HandleDestroy (object sender, EventArgs args)