Version bump.

Package-Manager: portage-2.1.4.4

4 files changed, 122 insertions, 2 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index ee4fb41309c8..0e2333923588 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/f-spot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.26 2008/01/04 14:47:42 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.27 2008/02/19 10:06:36 calchan Exp $
+
+*f-spot-0.4.2 (19 Feb 2008)
+
+  19 Feb 2008; Denis Dupeyron <calchan@gentoo.org>
+  +files/f-spot-0.4.2-color-adjust.patch, +f-spot-0.4.2.ebuild:
+  Version bump.
 
   04 Jan 2008; Denis Dupeyron <calchan@gentoo.org> f-spot-0.4.1.ebuild:
   Disabled tests, thanks to Dustin Surawicz (see bug #203566).
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index 987af8c97212..9c3d162d78dc 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -1,16 +1,19 @@
 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
 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
-MISC ChangeLog 4619 RMD160 e55fa7db5ff9573e2d5ff283400e758d6b9234ca SHA1 e2845d22df24a7f2461863fcbaca030925ec4f24 SHA256 1d079ecef6b25ff5e5dab82741c4872ce61ae8f0c3c8f0fbbdbeeebce37364a7
+EBUILD f-spot-0.4.2.ebuild 1403 RMD160 31cd652171801336ef383ad63414ddf3d59f42a6 SHA1 eb7796896f2c11f9fd4dba9114e572e3a752c2fe SHA256 678e14d4e79b991f69fe64abe94171974bce4376f7a09774371f5c9640765fcb
+MISC ChangeLog 4780 RMD160 23e3ae5882486751bee3ce364de4b90e89dd9fcd SHA1 fc206fb29c5880541df252e79c75353f51e6c57e SHA256 88057d2a9ba1fe10d10f0e8e258ca46f64b7f4355141bc57e2117d2edfa7c1a7
 MISC metadata.xml 366 RMD160 f895da104e75be41ce309cbf30814caf5715d2c7 SHA1 8805f110ba4d50b660d36041a2eeb3cae827547c SHA256 26ff06bcfabc529fd1d0e7af0c28a0e47f73b913a54e5d738cb7ea8bac9e54af
diff --git a/media-gfx/f-spot/f-spot-0.4.2.ebuild b/media-gfx/f-spot/f-spot-0.4.2.ebuild
new file mode 100644
index 000000000000..edd35b7caaa3
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.4.2.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2008/02/19 10:06:36 calchan 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
+}
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
new file mode 100644
index 000000000000..d0550e874e0e
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.4.2-color-adjust.patch
@@ -0,0 +1,55 @@
+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
+