Fix bug 282384, seems gconf is a rock-hard requirement if you use linux. Bump, bug 282804. Remove -G*_DISABLE_DEPRECATED from libfspot makefile. 0.6.1.1 also fixes parallel make, bug 281242.

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

4 files changed, 76 insertions, 7 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index aefb2ef6008d..9163e222ebba 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.39 2009/08/23 12:23:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.40 2009/08/27 21:16:25 loki_val Exp $
+
+*f-spot-0.6.1.1 (27 Aug 2009)
+
+  27 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> f-spot-0.6.0.0.ebuild,
+  +f-spot-0.6.1.1.ebuild:
+  Fix bug 282384, seems gconf is a rock-hard requirement if you use linux.
+  Bump, bug 282804. Remove -G*_DISABLE_DEPRECATED from libfspot makefile.
+  0.6.1.1 also fixes parallel make, bug 281242.
 
   23 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   f-spot-0.6.0.0.ebuild:
diff --git a/media-gfx/f-spot/f-spot-0.6.0.0.ebuild b/media-gfx/f-spot/f-spot-0.6.0.0.ebuild
index 998bfb18b567..9f39d856b514 100644
--- a/media-gfx/f-spot/f-spot-0.6.0.0.ebuild
+++ b/media-gfx/f-spot/f-spot-0.6.0.0.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.6.0.0.ebuild,v 1.3 2009/08/23 12:23:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.6.0.0.ebuild,v 1.4 2009/08/27 21:16:25 loki_val Exp $
 
 EAPI=2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://f-spot.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+gconf beagle"
+IUSE="beagle"
 
 RDEPEND=">=dev-lang/mono-2.0
 	>=gnome-base/libgnome-2.2
@@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/mono-2.0
 	>=dev-libs/glib-2.16
 	>=dev-dotnet/gnome-sharp-2.8
 	>=dev-dotnet/glib-sharp-2.12
-	gconf? ( >=dev-dotnet/gconf-sharp-2.12.2 )
+	>=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
@@ -55,8 +55,7 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure --disable-static --disable-scrollkeeper \
-		$(use_enable gconf)
+	gnome2_src_configure --disable-static --disable-scrollkeeper
 }
 
 src_install() {
diff --git a/media-gfx/f-spot/f-spot-0.6.1.1.ebuild b/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
new file mode 100644
index 000000000000..c2e82e64b732
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.6.1.1.ebuild
@@ -0,0 +1,63 @@
+# 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.ebuild,v 1.1 2009/08/27 21:16:25 loki_val 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 ~ppc ~x86"
+IUSE="beagle"
+
+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"
+
+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"
+	sed  -r -i -e 's:-D[A-Z]+_DISABLE_DEPRECATED::g' \
+		lib/libfspot/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static --disable-scrollkeeper
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
diff --git a/media-gfx/f-spot/metadata.xml b/media-gfx/f-spot/metadata.xml
index a74ac321f869..f8bf6ca49efb 100644
--- a/media-gfx/f-spot/metadata.xml
+++ b/media-gfx/f-spot/metadata.xml
@@ -10,7 +10,6 @@
 		Personal photo manager for gnome 2 desktop that uses mono
 	</longdescription>
 	<use>
-		<flag name="gconf">Enable GConf settings backend</flag>
 		<flag name="beagle">Enable app-misc/beagle support for searches</flag>
 	</use>
 </pkgmetadata>