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.

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

5 files changed, 81 insertions, 20 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/Manifest b/media-gfx/f-spot/Manifest
index a020fb5e8cd0..28446f2afd10 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -1,20 +1,12 @@
------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
 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 1682 RMD160 578c6d12988149c4eeff9b50fa4b94f72e155555 SHA1 4890e49fe29af88f25afcdb2542dba26ae399c97 SHA256 7785b25e22936561d30d68868727448b5b7322f130a3b5a3c0dcc6ff06f36e7a
-MISC ChangeLog 6957 RMD160 fd5b6837a1c3753f3cc678fe57c313ed64a6b59b SHA1 fc1a6abd94d9938363f27e2674d2f8b39e2c95ac SHA256 d7b98a125dd1d1d0c4e628abd71324717d0073aa4de3962cc65f13f727d9565b
-MISC metadata.xml 511 RMD160 5ca45c3aa20326d160a393ca4871839c29a2e895 SHA1 b26a59c076229e767a2406c9b8ef12672624006e SHA256 0a10c32b2dd66d0bee53992069d4ff4f440f087ea9a14a5457487cfdd2057896
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqRNN4ACgkQAiZjviIA2Xi2VACcCT0WbWgkRsOpIg4XoXBalCmQ
-WsMAnidCEoowbScJ4OoXiZQja5t0Nd4d
-=xhVn
------END PGP SIGNATURE-----
+EBUILD f-spot-0.6.0.0.ebuild 1639 RMD160 299a29201e84a972eb4c06fe8e255d1e04b98fc8 SHA1 eebc7a14a852c31deb88bc36a410428e3bc0874c SHA256 098a9fe81490c69b83f2efa387ed9dd1def509b50d010c7d9dca8c297aacf52f
+EBUILD f-spot-0.6.1.1.ebuild 1643 RMD160 5c8d70afb58cfd66d9576469bd2c5b19d4b8d711 SHA1 61b016ab91b80aadeb9996aa51df3ba560313284 SHA256 7d243a2f75d74a79ebcba8f53524b759ca81fe6898441b495f557357c55560c8
+MISC ChangeLog 7287 RMD160 3f8534cc73b41355b35ce0a17f132fa1a0558f04 SHA1 0cde96254121ee2425fb1096fb0c0332d8bb837b SHA256 966ab20f8641cc09e3d3b57191a8d1b91d7d26550c9252f75a59b1cd1823aaaa
+MISC metadata.xml 453 RMD160 8a36645394c05be09a3f1c607b2f369cc5dc00a4 SHA1 84e3d45c42c0806302316b7038267e77b07f2927 SHA256 6b85e2644101d885cfed3e808c4bfff4f9a7065933e08e739c46baf4502ad8d0
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>