Fix bugs 248630, 248633, 248634 and 252636. Respectively a QA warning, a crasher, a crasher and a sandbox violation with new sandbox. Thanks to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for patches and QA report. Remove old versions. Also add dotnet as herd.

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

17 files changed, 122 insertions, 601 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index 8868cc27e231..c30c8003a6b0 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,9 +1,24 @@
 # 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.32 2009/01/05 17:21:58 loki_val Exp $
-
-  05 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> f-spot-0.5.0.3.ebuild:
-  Fix for new gtk-sharp-module eclass
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.33 2009/02/01 16:24:47 loki_val Exp $
+
+*f-spot-0.5.0.3-r1 (01 Feb 2009)
+
+  01 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/f-spot-0.1.3-mono-1.1.10.patch,
+  -files/f-spot-0.3.3-dont_eat_cpu.patch,
+  -files/f-spot-0.3.5-picasa_fix.patch,
+  -files/f-spot-0.4.2-color-adjust.patch,
+  +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,
+  metadata.xml, -f-spot-0.3.3.ebuild, -f-spot-0.3.4.ebuild,
+  -f-spot-0.3.5.ebuild, -f-spot-0.3.5-r1.ebuild, -f-spot-0.4.0.ebuild,
+  -f-spot-0.4.1.ebuild, -f-spot-0.4.2.ebuild, -f-spot-0.5.0.3.ebuild,
+  +f-spot-0.5.0.3-r1.ebuild:
+  Fix bugs 248630, 248633, 248634 and 252636. Respectively a QA warning, a
+  crasher, a crasher and a sandbox violation with new sandbox. Thanks to
+  Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for patches and QA report.
+  Remove old versions. Also add dotnet as herd.
 
 *f-spot-0.5.0.3 (23 Nov 2008)
 
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index 350ee3cd6079..10a9374d3dd5 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -1,23 +1,8 @@
-AUX f-spot-0.1.3-mono-1.1.10.patch 1955 RMD160 b71803f06ecab22513b81a3fd82ad470aa2fb94f SHA1 8b0650e58e4419cf2ef5eb1364ddd05a60433b63 SHA256 7e9e4b3aceb3490aed98a28e1b5b1c602ae1077952c78f0280a6f745ffdf0daf
-AUX f-spot-0.3.3-dont_eat_cpu.patch 931 RMD160 56a138d7e08d5581ac1dc6a45f5f380b379d2f5f SHA1 cc7eec25afc3abe28bc047545f803736f7318d64 SHA256 0c9953a3bcf66de6ce263d0ab9d027c35dcae33adf9133ac08451f2b234d0be7
-AUX f-spot-0.3.5-picasa_fix.patch 769 RMD160 af1579dc313b746ba4bbe21d3748f42af2ed81c6 SHA1 ff7f52364fa8e65eb5ba705e990525de712c1351 SHA256 12baa01fcfea792c4ec174d11880cd5f2c1a1e664011b4f96151385fea2ef8f3
-AUX f-spot-0.4.2-color-adjust.patch 1484 RMD160 bcb9ddee2fca57bed2f34a3f66b6622c4cb77084 SHA1 58e283f9126481cddfb347c69fcc852041d58ae0 SHA256 ab317c8c86f8dd714d3a7f772147f2c7a4d52a4b4b2adb94344291e8b0ab3940
-DIST f-spot-0.3.3.tar.bz2 1748891 RMD160 7f0e7599c5338b82e94f9e0ddf3ddbd4ec187344 SHA1 9254728c0cdb12bfa0190c1c8f15b8bfc79d013f SHA256 318af2ab4bb4fba06894bdb1b538197fdb6daefa7b0b6830350a8168b0b501ad
-DIST f-spot-0.3.4.tar.bz2 1758147 RMD160 f84482a3e6026104ea5bcbade399649916800d38 SHA1 0c421f7fc67ac70c793b6d1a1a7d838038ba8985 SHA256 aee76da748c0b3050f6f1a8d09d23eb51324efae5ae2688178fc8a335dbecbe2
-DIST f-spot-0.3.5.tar.bz2 1770616 RMD160 c15334dc45ed55b9316a379cdc62e8484bb31440 SHA1 287bb81ab60e1f642a86937d45681a6a61d52d9c SHA256 441997d27f0155ab2090b14dd6f29ccdf850f3565fa951dac5e589c75980a72b
-DIST f-spot-0.4.0.tar.bz2 2178174 RMD160 0d01f5a493d8c5361252db11302564cccf435d6b SHA1 a31df32126ea7c260d5753da7413811aa08d4540 SHA256 c0288df6c83b63698a47ad70ec596d424f1bf40e567c294a677e01f82df5348e
-DIST f-spot-0.4.1.tar.bz2 2261199 RMD160 c19f33e208c5b99d2dfcf093abb158b5b9742ad9 SHA1 a4ac7e8ce38a00409d67a7423c796e324165e16f SHA256 82d606103580447998ea9af44161c3628880021e4a7e5bf8ed68c4e3c7be52c4
-DIST f-spot-0.4.2.tar.bz2 2322315 RMD160 1fc8150b285fa0fc296e6ff29f6f182637590bfd SHA1 ae0789f74acf5afd27c1a236ddd990a7eace1bef SHA256 92658edec7f0d4965712a079c8a0a5876e390a6e82a9c057c55061571dcc7685
+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
 DIST f-spot-0.4.3.1.tar.bz2 2494478 RMD160 6fbda5239ce78ab57c8bd033ea6abf6ce62bfafd SHA1 9cbed08261f7576185ac1dda837c3d62e1978031 SHA256 c0900eaac824a30e6c6b1741afeadf265a1c126b899bd8a7eb397752d7d1b6c3
 DIST f-spot-0.5.0.3.tar.bz2 2776582 RMD160 0b02a2a5a8133e4304dfe6d0d6e971ee6ee48d0c SHA1 9b666c1d38ea765ddbbba56c42eaa721e2f14096 SHA256 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
-EBUILD f-spot-0.3.3.ebuild 2038 RMD160 0acf0c8e9e032b8ead2c0bab9d3bb15ac63a6da9 SHA1 9cd2c2d97931bf9da2e4d76b44eba484c0903627 SHA256 2b565fda8a4ebc75c1cc8418dac26b73dc47ec987e8cad5103e02b65183f74df
-EBUILD f-spot-0.3.4.ebuild 1649 RMD160 238391d51e3e6d45fc6d8ec28a5fc53cdf7ecb62 SHA1 d8bf4412a6c2ebcc8572cd8352091904d8b90b7b SHA256 41d7046e97f811fd5294e7c792fdb65752e2bf8536cc7a1cf737ac5e0cfcbea2
-EBUILD f-spot-0.3.5-r1.ebuild 1693 RMD160 df8f5b5daf2ec2b27bae8c9f1e7e021f118a2828 SHA1 eb05602b5ecdbb238fb83459b4bec4d998304d44 SHA256 026a6320d6e8e12e73eb7dfaf618ffcba928c8554100edac9dbc37d6dc40c123
-EBUILD f-spot-0.3.5.ebuild 1649 RMD160 58412c230a086ef2d04333b18cdd44f5ee8612cc SHA1 3f32c88ccb3d3b4193774d09b93370f53be19637 SHA256 203d65f57765a94ee5ec78173daacfe19e28c963ff91ff5817139fa445771fcf
-EBUILD f-spot-0.4.0.ebuild 1648 RMD160 536193c07545a05d956df64e3284fda98cdfae64 SHA1 884a2bd20d1159be5051c685210e4e6baa0a9d3e SHA256 9156ee79913024d2878a7a152de5237acc7da328843d1641f4045b77e1c4cea0
-EBUILD f-spot-0.4.1.ebuild 1014 RMD160 2391af173222a8ace31f87b7b0688206ebca4eac SHA1 205b1943baa7e0ab2896aad8f5b86f6fa15cc8b0 SHA256 6341fa0831501d441e5b2cf9b1dd29f12b8da694d81e4530296e068ef339c673
-EBUILD f-spot-0.4.2.ebuild 1457 RMD160 8c292554ddb622796ed95c623e47690436995941 SHA1 1192cd09b275eaa52b0c151ab60d0f7a4ee6934b SHA256 6130fa9cc8f7a1c6c6e900607101db7f6d3dab97c1e417c5263bde07d1a93e77
 EBUILD f-spot-0.4.3.1.ebuild 1356 RMD160 015d91aa1653e7bd2dcd17cd64cda7504a5b831c SHA1 874e995b7f733232ac681dd0c91c70024fed8dde SHA256 de29cfd64127ca906aead6081bbd7e6676621fee2e26d0d032b270aeaada5fd0
-EBUILD f-spot-0.5.0.3.ebuild 1147 RMD160 a094ac522a73e3463475fd03faad076e5302df90 SHA1 aceeb3f4266cc2fc44b11843ed057642cb4ba924 SHA256 6369f2a4752db4051d653ad8a2fe9e8fe4571d803f60372a8eb3abdb726916f0
-MISC ChangeLog 5404 RMD160 6f2e7931437238ba18d5ca7579f920754edd6645 SHA1 aa691c69576a050ec74d61ca46ed4e67cc75bff4 SHA256 41ebde0ea26decd29d37d45ffe62b913592147eccd8c4c02a5b6576576e93b9e
-MISC metadata.xml 366 RMD160 f895da104e75be41ce309cbf30814caf5715d2c7 SHA1 8805f110ba4d50b660d36041a2eeb3cae827547c SHA256 26ff06bcfabc529fd1d0e7af0c28a0e47f73b913a54e5d738cb7ea8bac9e54af
+EBUILD f-spot-0.5.0.3-r1.ebuild 1705 RMD160 ec2b0ad9442767efd7bde34ee727d14886a8547e SHA1 e4aed6cda821a057c81f2edc6e313d9d77e4b2a4 SHA256 1cee5bfbc57e7674319abdd398008f61fc0dc021f5781189c97bcb154c7e256d
+MISC ChangeLog 6160 RMD160 50234775c854796d85e91e1f45d34043835027bc SHA1 f7a5e422f6e54482b0a0a60f72cd09eb6b2535dd SHA256 8c6ece421e169a0cab44ff09b42287e805383e29909fb55fca150f0f77c90e97
+MISC metadata.xml 365 RMD160 a22107faaa65a4397d44ff9d4f933db9c035d532 SHA1 0ca0017b2fb1b2b432ac5c12dfcf06358333e790 SHA256 f36ffa6e9a595fd3e8978318314da449472d246abcc9f8230103040db9587136
diff --git a/media-gfx/f-spot/f-spot-0.3.3.ebuild b/media-gfx/f-spot/f-spot-0.3.3.ebuild
deleted file mode 100644
index 934808a0c58e..000000000000
--- a/media-gfx/f-spot/f-spot-0.3.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.3 2007/08/02 06:13:56 mr_bones_ 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
-	>=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/f-spot-0.3.4.ebuild b/media-gfx/f-spot/f-spot-0.3.4.ebuild
deleted file mode 100644
index eaed02d19c29..000000000000
--- a/media-gfx/f-spot/f-spot-0.3.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4.ebuild,v 1.3 2007/08/02 06:13:56 mr_bones_ 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
-	>=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"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-
-	# 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/f-spot-0.3.5-r1.ebuild b/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild
deleted file mode 100644
index 8ae33cbf64b6..000000000000
--- a/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.5-r1.ebuild,v 1.3 2007/08/02 06:13:56 mr_bones_ 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
-	>=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"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-
-	# 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
-	epatch ${FILESDIR}/${P}-picasa_fix.patch
-	eautoconf || die "autoconf failed"
-}
diff --git a/media-gfx/f-spot/f-spot-0.3.5.ebuild b/media-gfx/f-spot/f-spot-0.3.5.ebuild
deleted file mode 100644
index 49df86a8bd87..000000000000
--- a/media-gfx/f-spot/f-spot-0.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.5.ebuild,v 1.3 2007/08/02 06:13:56 mr_bones_ 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
-	>=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"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-
-	# 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/f-spot-0.4.0.ebuild b/media-gfx/f-spot/f-spot-0.4.0.ebuild
deleted file mode 100644
index 1f54a3ce36c3..000000000000
--- a/media-gfx/f-spot/f-spot-0.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4.0.ebuild,v 1.1 2007/08/23 00:39:06 metalgod 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
-	>=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"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-
-	# 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/f-spot-0.4.1.ebuild b/media-gfx/f-spot/f-spot-0.4.1.ebuild
deleted file mode 100644
index fe629e658c9d..000000000000
--- a/media-gfx/f-spot/f-spot-0.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 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.4.1.ebuild,v 1.2 2008/01/04 14:47:42 calchan Exp $
-
-inherit gnome2 mono
-
-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
-	>=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.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}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-# See bug #203566
-RESTRICT="test"
diff --git a/media-gfx/f-spot/f-spot-0.4.2.ebuild b/media-gfx/f-spot/f-spot-0.4.2.ebuild
deleted file mode 100644
index 9e4d926405aa..000000000000
--- a/media-gfx/f-spot/f-spot-0.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 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.4.2.ebuild,v 1.3 2008/06/29 10:21:06 tove Exp $
-
-inherit gnome2 mono 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
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	>=dev-dotnet/gtk-sharp-2.8
-	>=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/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.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}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# See bug #203566
-RESTRICT="test"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-
-	# Fix http://bugzilla.gnome.org/show_bug.cgi?id=517193
-	epatch "${FILESDIR}"/${P}-color-adjust.patch
-
-	# Disable Beagle
-	sed -i -e '/PKG_CHECK_MODULES.*BEAGLE/,/AC_SUBST.*LINK_BEAGLE/ d' configure.in || die "sed failed"
-
-	eautoreconf
-	intltoolize --force || die "intltoolize --force failed"
-}
diff --git a/media-gfx/f-spot/f-spot-0.5.0.3.ebuild b/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild
index 9daf793f93fe..613bb5cd4ed3 100644
--- a/media-gfx/f-spot/f-spot-0.5.0.3.ebuild
+++ b/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2009/01/05 17:21:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.5.0.3-r1.ebuild,v 1.1 2009/02/01 16:24:47 loki_val Exp $
 
 EAPI=2
 
@@ -44,6 +44,36 @@ 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"
+}
+
 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/files/f-spot-0.1.3-mono-1.1.10.patch b/media-gfx/f-spot/files/f-spot-0.1.3-mono-1.1.10.patch
deleted file mode 100644
index 96b08bba89b2..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.1.3-mono-1.1.10.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/f-spot/src/BitConverter.cs,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- src/BitConverter.cs	2005/10/13 19:57:22	1.3
-+++ src/BitConverter.cs	2005/10/25 17:54:27	1.4
-@@ -1,3 +1,6 @@
-+using System;
-+using System.Runtime.InteropServices;
-+
- namespace FSpot {
- 	public class BitConverter {
- 		public static uint Swap (uint val, bool little) 
-@@ -66,6 +69,17 @@
- 			return Swap (val, little);
- 		}
- 
-+		public static float ToSingle (byte [] data, int position, bool little)
-+		{
-+			float retval;
-+			unsafe {
-+				uint * ptr;
-+				ptr = (uint *)&retval;
-+				*ptr = ToUInt32 (data, position, little);
-+			}
-+			return retval;
-+		}
-+
- 		public static int ToInt32 (byte [] data, int position, bool little)
- 		{
- 			return unchecked ((int) ToUInt32 (data, position, little));
-===================================================================
-RCS file: /cvs/gnome/f-spot/src/Ciff.cs,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- src/Ciff.cs	2005/09/25 08:37:34	1.8
-+++ src/Ciff.cs	2005/10/25 17:54:27	1.9
-@@ -1,3 +1,5 @@
-+using System;
-+
- namespace FSpot.Ciff {
- 	public enum Tag {
- 		// Byte valuesad
-@@ -83,6 +85,8 @@
- 		ExifInformation = 0x300b
- 	}
- 
-+	
-+
- 	public struct ImageSpec {
- 		public uint ImageWidth;  // Number of horizontal pixels
- 		public uint ImageHeight; // Number of vertical pixels
-@@ -96,10 +100,8 @@
- 		{
- 			ImageWidth = BitConverter.ToUInt32 (data, 0, little);
- 			ImageHeight = BitConverter.ToUInt32 (data, 4, little);
--			unsafe {
--				float *p = &PixelAspectRatio;
--				*((uint *)p) = BitConverter.ToUInt32 (data, 8, little);
--			}
-+
-+			PixelAspectRatio = BitConverter.ToSingle (data, 8, little);
- 			RotationAngle = BitConverter.ToInt32 (data, 12, little);
- 			ComponentBitDepth = BitConverter.ToUInt32 (data, 16, little);
- 			ColorBitDepth = BitConverter.ToUInt32 (data, 20, little);
-
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
deleted file mode 100644
index b2156b205580..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.3.3-dont_eat_cpu.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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)
diff --git a/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch b/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch
deleted file mode 100644
index 1033c139b012..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- google-sharp/PicasaWeb.cs	2007-01-09 10:07:29.000000000 +0800
-+++ google-sharp/PicasaWeb.cs	2007-05-28 20:20:48.000000000 +0800
-@@ -260,7 +260,8 @@ namespace Mono.Google.Picasa {
- 			XmlNamespaceManager nsmgr = new XmlNamespaceManager (doc.NameTable);
- 			nsmgr.AddNamespace ("photo", "http://www.pheed.com/pheed/");
- 			nsmgr.AddNamespace ("media", "http://search.yahoo.com/mrss/");
--			nsmgr.AddNamespace ("gphoto", "http://picasaweb.google.com/lh/picasaweb");
-+			nsmgr.AddNamespace ("gphoto", "http://schemas.google.com/photos/2007");
-+			nsmgr.AddNamespace ("batch", "http://schemas.google.com/gdata/batch");
- 			node = channel.SelectSingleNode ("gphoto:user", nsmgr);
- 			user = node.InnerText;
- 			node = channel.SelectSingleNode ("gphoto:nickname", nsmgr);
diff --git a/media-gfx/f-spot/files/f-spot-0.4.2-color-adjust.patch b/media-gfx/f-spot/files/f-spot-0.4.2-color-adjust.patch
deleted file mode 100644
index d0550e874e0e..000000000000
--- a/media-gfx/f-spot/files/f-spot-0.4.2-color-adjust.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(revision 3689)
-+++ src/Makefile.am	(working copy)
-@@ -385,7 +385,7 @@
- 	$(F_SPOT_DISTRESOURCES)			\
- 	f-spot.exe.config.in			\
- 	f-spot.in				\
--	Cms.dll.config
-+	Cms.dll.config.in
- 
- CLEANFILES =					\
- 	f-spot.exe.config			\
-@@ -399,7 +399,8 @@
- 	FSpot.Query.dll				\
- 	FSpot.Query.dll.mdb			\
- 	FSpot.Core.dll.mdb			\
--	FSpot.Core.dll
-+	FSpot.Core.dll				\
-+	Cms.dll.config
- 
- 
- DISTCLEANFILES = 				\
-Index: src/Cms.dll.config
-===================================================================
---- src/Cms.dll.config	(revision 3689)
-+++ src/Cms.dll.config	(working copy)
-@@ -1,4 +0,0 @@
--<configuration>
--  <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
--</configuration>
--
-Index: src/Cms.dll.config.in
-===================================================================
---- src/Cms.dll.config.in	(revision 0)
-+++ src/Cms.dll.config.in	(revision 0)
-@@ -0,0 +1,5 @@
-+<configuration>
-+  <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-+  <dllmap dll="libfspot" target="@expanded_libdir@/f-spot/libfspot.so.0"/>
-+</configuration>
-+
-Index: configure.in
-===================================================================
---- configure.in	(revision 3689)
-+++ configure.in	(working copy)
-@@ -292,6 +292,7 @@
- src/Core/Defines.cs
- src/AssemblyInfo.cs
- src/f-spot.exe.config
-+src/Cms.dll.config
- src/Makefile
- glitz-sharp/Makefile
- glitz-sharp/src/Makefile
-
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
new file mode 100644
index 000000000000..6bdf3610d7e8
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.5.0.3-icon-size-crash-fix.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000000..bd6cdb78ad04
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch
@@ -0,0 +1,17 @@
+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/metadata.xml b/media-gfx/f-spot/metadata.xml
index 95e95a4da7bf..410a76a7c043 100644
--- a/media-gfx/f-spot/metadata.xml
+++ b/media-gfx/f-spot/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>dotnet</herd>
 	<maintainer>
 		<email>calchan@gentoo.org</email>
 		<name>Denis Dupeyron</name>