From e35be7273b33980584554f80779a3e0eaf6b6803 Mon Sep 17 00:00:00 2001
From: Joe McCann <joem@gentoo.org>
Date: Mon, 12 Feb 2007 23:29:38 +0000
Subject: [PATCH] New version with bugfixes. Now works with newer versions of
 libexif and has a patch to prevent cpu spike when exporting Package-Manager:
 portage-2.1.2-r6

---
 media-gfx/f-spot/ChangeLog                    | 10 ++-
 media-gfx/f-spot/Manifest                     | 28 +++++--
 media-gfx/f-spot/f-spot-0.3.2.ebuild          |  8 +-
 media-gfx/f-spot/f-spot-0.3.3.ebuild          | 74 +++++++++++++++++++
 media-gfx/f-spot/files/digest-f-spot-0.3.3    |  3 +
 .../files/f-spot-0.3.3-dont_eat_cpu.patch     | 35 +++++++++
 6 files changed, 146 insertions(+), 12 deletions(-)
 create mode 100644 media-gfx/f-spot/f-spot-0.3.3.ebuild
 create mode 100644 media-gfx/f-spot/files/digest-f-spot-0.3.3
 create mode 100644 media-gfx/f-spot/files/f-spot-0.3.3-dont_eat_cpu.patch

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/Manifest b/media-gfx/f-spot/Manifest
index a66ed8fca25b..5642609a1d04 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -2,9 +2,14 @@ AUX f-spot-0.1.3-mono-1.1.10.patch 1955 RMD160 b71803f06ecab22513b81a3fd82ad470a
 MD5 bfd52f4c8afee309b5daac526ebd0d1f files/f-spot-0.1.3-mono-1.1.10.patch 1955
 RMD160 b71803f06ecab22513b81a3fd82ad470aa2fb94f files/f-spot-0.1.3-mono-1.1.10.patch 1955
 SHA256 7e9e4b3aceb3490aed98a28e1b5b1c602ae1077952c78f0280a6f745ffdf0daf files/f-spot-0.1.3-mono-1.1.10.patch 1955
+AUX f-spot-0.3.3-dont_eat_cpu.patch 931 RMD160 56a138d7e08d5581ac1dc6a45f5f380b379d2f5f SHA1 cc7eec25afc3abe28bc047545f803736f7318d64 SHA256 0c9953a3bcf66de6ce263d0ab9d027c35dcae33adf9133ac08451f2b234d0be7
+MD5 57c7f1509826c1c7732dd9dae04dc6e8 files/f-spot-0.3.3-dont_eat_cpu.patch 931
+RMD160 56a138d7e08d5581ac1dc6a45f5f380b379d2f5f files/f-spot-0.3.3-dont_eat_cpu.patch 931
+SHA256 0c9953a3bcf66de6ce263d0ab9d027c35dcae33adf9133ac08451f2b234d0be7 files/f-spot-0.3.3-dont_eat_cpu.patch 931
 DIST f-spot-0.2.2.tar.bz2 1094602 RMD160 21177505301ca9c69f1f40008e1703f3ba601327 SHA1 a91972195574c02d7e880956c761a6fe36698574 SHA256 356b3cb519eb38699248c87cb29e7a7b0e65fcc3bdbaa567d204c2395170a784
 DIST f-spot-0.3.0.tar.bz2 1175628 RMD160 3dd0dcd293f72f105d5980418e9e5ba9d3d7162f SHA1 cf6e08dd447c1a48877dd036659787b77b4c17e8 SHA256 f0caa0739e7c86963f5c124f5bdd2cdfe41da18a560ae590b343a2305e0b43d1
 DIST f-spot-0.3.2.tar.bz2 1709277 RMD160 3ce12beeffe80f1afae21e57c0766d44d6269e9a SHA1 f2dbdcd36afca5890d41da646afa0b8721d3c232 SHA256 a1ffa2d3c97cc0727902021e44f8476d90d503cc2376f39b2e6a132e9aee78a4
+DIST f-spot-0.3.3.tar.bz2 1748891 RMD160 7f0e7599c5338b82e94f9e0ddf3ddbd4ec187344 SHA1 9254728c0cdb12bfa0190c1c8f15b8bfc79d013f SHA256 318af2ab4bb4fba06894bdb1b538197fdb6daefa7b0b6830350a8168b0b501ad
 EBUILD f-spot-0.2.2.ebuild 1904 RMD160 180b2921171857284599feb4a8f18732c1b9d43a SHA1 d1af630df4f082bcf8d098847408163749f553d1 SHA256 666d876df390fe5fb7708f5004061d6d36a9249972ae68a36a1b15742dd94355
 MD5 78d92cf38a5b08c31802756ec0de3b7c f-spot-0.2.2.ebuild 1904
 RMD160 180b2921171857284599feb4a8f18732c1b9d43a f-spot-0.2.2.ebuild 1904
@@ -13,14 +18,18 @@ EBUILD f-spot-0.3.0.ebuild 1973 RMD160 926e969a9feb40630a279efe8d7ac2c9bf845e61
 MD5 86f2b772c7a0878ba72515f0a7dde9d1 f-spot-0.3.0.ebuild 1973
 RMD160 926e969a9feb40630a279efe8d7ac2c9bf845e61 f-spot-0.3.0.ebuild 1973
 SHA256 b315d3beb79dca90839f94f0c9a2acf102c86dd176caa6ff45ae8e3c0e610d22 f-spot-0.3.0.ebuild 1973
-EBUILD f-spot-0.3.2.ebuild 1973 RMD160 a2cfd5fe4edfebd347fac5f024d0545c88886b87 SHA1 f3d1fa15ea4d112490705392d6ea224ca41f65ab SHA256 a6c47600d7beb3721a9f750c113bee5761b6409400b4b00fa94effc5fb5a2cba
-MD5 a8d511214078663f392adcab10792b16 f-spot-0.3.2.ebuild 1973
-RMD160 a2cfd5fe4edfebd347fac5f024d0545c88886b87 f-spot-0.3.2.ebuild 1973
-SHA256 a6c47600d7beb3721a9f750c113bee5761b6409400b4b00fa94effc5fb5a2cba f-spot-0.3.2.ebuild 1973
-MISC ChangeLog 2814 RMD160 0f0dbb8cf2ebc59ac25bab04b7e5f0f84c94db9b SHA1 fd800a898c91833a27cfb9d4f6aef57b94a8ffc0 SHA256 e850ff3a8d58aac95ee2378f566f4268069be64ae25601b9732ec5b1bd24d3cd
-MD5 d1136840c1e10e627d36fc7dbc1451c3 ChangeLog 2814
-RMD160 0f0dbb8cf2ebc59ac25bab04b7e5f0f84c94db9b ChangeLog 2814
-SHA256 e850ff3a8d58aac95ee2378f566f4268069be64ae25601b9732ec5b1bd24d3cd ChangeLog 2814
+EBUILD f-spot-0.3.2.ebuild 2043 RMD160 39e3ce72d9f66adb3f57c6a8e976accd2ae2f7dd SHA1 2afeb62069aa1099d44c903456fc7361e775decc SHA256 8cc2d5cff920547a32a05c40d9ad3e713b9bbe3eac4990bb3ba1422453ed495b
+MD5 f90d35b20b427d89a063892cebd450d3 f-spot-0.3.2.ebuild 2043
+RMD160 39e3ce72d9f66adb3f57c6a8e976accd2ae2f7dd f-spot-0.3.2.ebuild 2043
+SHA256 8cc2d5cff920547a32a05c40d9ad3e713b9bbe3eac4990bb3ba1422453ed495b f-spot-0.3.2.ebuild 2043
+EBUILD f-spot-0.3.3.ebuild 2087 RMD160 9b33ac0edd11a8e2066b032a3d72d7b660f30821 SHA1 d83664a9ad7add795702ce01a258738ec3b2ba21 SHA256 cf2dd35a612ff2ee1485c7bdae3ff0c9638733bf1ee4f0462c22ff9b2ab267ac
+MD5 ad2f06f1a902a545463f1796527dd48d f-spot-0.3.3.ebuild 2087
+RMD160 9b33ac0edd11a8e2066b032a3d72d7b660f30821 f-spot-0.3.3.ebuild 2087
+SHA256 cf2dd35a612ff2ee1485c7bdae3ff0c9638733bf1ee4f0462c22ff9b2ab267ac f-spot-0.3.3.ebuild 2087
+MISC ChangeLog 3099 RMD160 3c20b4e6e2df04196cb6f18e9133698c306136cd SHA1 f674522c624b091c8aa51f172f359dc42ced2900 SHA256 26f6e2d5763767834f8cf2a1d72e92668c2dc9d1b287027db2b8311ed56ef7d9
+MD5 3db3cd4d891a3cdf3d70bbb6c863621c ChangeLog 3099
+RMD160 3c20b4e6e2df04196cb6f18e9133698c306136cd ChangeLog 3099
+SHA256 26f6e2d5763767834f8cf2a1d72e92668c2dc9d1b287027db2b8311ed56ef7d9 ChangeLog 3099
 MISC metadata.xml 337 RMD160 80b2e812b2732b5388739bd3cbe01ef51b6387a0 SHA1 0147b84f63656c21724cc6a4b96ab8d9c2da6e06 SHA256 b985a0744c3050346f8910c0689ca80f4e2b6d3bc54856d17b39756132afc7da
 MD5 e48cb5f8090572cbfd7288a0aa429618 metadata.xml 337
 RMD160 80b2e812b2732b5388739bd3cbe01ef51b6387a0 metadata.xml 337
@@ -34,3 +43,6 @@ SHA256 1b30e95e35f377638cc2984c48ecc3755ae6516a675bb13342c5e23c9bcac45c files/di
 MD5 33ca9ecfa3b108a8672383d0e80f13de files/digest-f-spot-0.3.2 244
 RMD160 a75feed9ca427508d9329a56bff04a9c3adad7bf files/digest-f-spot-0.3.2 244
 SHA256 1555fd1187ad77c572fdb2233f4703be95f76b34d3b0be4c9b3e48d7676c6717 files/digest-f-spot-0.3.2 244
+MD5 fe08d8dcd81d26c9512cd33ccc36b382 files/digest-f-spot-0.3.3 244
+RMD160 e1d80ec605cc0d17d11038a005288f6545a9ad5b files/digest-f-spot-0.3.3 244
+SHA256 d0d1f19ef83e5bed27abe3e34a0ed2cd82719c003b32c1080372f3711f87df39 files/digest-f-spot-0.3.3 244
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)
-- 
2.26.2