Apply upstream patch to fix building without exif USE flag (bug #328221 by Diego E. 'Flameeyes' Pettenò and Alexander Goetz), fix libbrasero configure option.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 56 insertions, 8 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index e83ae72dc759..8f1bd3ae7099 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.113 2010/07/13 12:12:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.114 2010/07/14 18:18:48 pacho Exp $
+
+  14 Jul 2010; Pacho Ramos <pacho@gentoo.org> gthumb-2.11.5.ebuild,
+  +files/gthumb-2.11.5-configure-exiv2.patch:
+  Apply upstream patch to fix building without exif USE flag (bug #328221 by
+  Diego E. 'Flameeyes' Pettenò and Alexander Goetz), fix libbrasero
+  configure option.
 
 *gthumb-2.11.5 (13 Jul 2010)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 9f06e6971362..9f22cff42127 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX gthumb-2.11.2.1-configure.patch 1030 RMD160 69f996cec1473ec0bcbe5f35822de09f1afdab2e SHA1 68151dfb026af923cf0a1f59a1c09942711a0fd3 SHA256 a146e4ea4df9763693182ee9d702fd263f5593912ba47d233b172d8adbf129c5
+AUX gthumb-2.11.5-configure-exiv2.patch 1510 RMD160 47c6af0ab917b7f9b979b533897ba3b1da22f450 SHA1 721283895e15b084b96b426c1579200c77d61481 SHA256 9a0de0322090c92f184bde1a3b3a04d411cf7a73ec9515e88e5657703fd3a189
 DIST gthumb-2.10.11.tar.bz2 2839510 RMD160 ceaef54c96cc6dbea23fe6c461d26b685b13778a SHA1 a9c133f3a652249329da8b5be8ff08dfec0ded9f SHA256 68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e
 DIST gthumb-2.11.5.tar.bz2 4067761 RMD160 4f24f1273e2fb11dd1c7d77303bc14a15201011c SHA1 33ccc5940082ad869552a86886b5dad9c2458343 SHA256 5e5abfb9cb82eef929483b7daf57c3a50bba1949ad0563c09180704f8fa01544
 EBUILD gthumb-2.10.11.ebuild 1473 RMD160 1ee73d969206bd8eb6cce5379501b6ad4c6ce1af SHA1 029a81faecfd837fe0a4127fc4f0c8236d083459 SHA256 c2a936aa17b42d873b16efef7e0b0f9d632f3e2d377a59475bdf1ef4cfa53768
-EBUILD gthumb-2.11.5.ebuild 1985 RMD160 389984be586efc15535a92b96fd0be273543a14c SHA1 fbaf26f96d1715d3469d727806d9f22f37d77842 SHA256 b4aaf348f2042517d1da084745a877d2d5618df17d44b583fae7b5bbef7818d0
-MISC ChangeLog 16897 RMD160 1d0b76a5cc3d2c04dc790b4d84b7fdd55532c131 SHA1 a31ac1997055f27ab05a30e05c6d2f5b295a016f SHA256 e6bb88c237037999497b5f476086e3925926ee429f5dc3b7cbc4b8b236888689
+EBUILD gthumb-2.11.5.ebuild 2094 RMD160 54718050a925f298d6707f065f87256ce3d733cf SHA1 9717e95f785204f7ffe8ebf2450247007af143e3 SHA256 c2dc10ba51a1d3e62e5313cf0e78988a68d798576cddd1cef3f83afa8c9c7ebd
+MISC ChangeLog 17178 RMD160 1d6363372469a4a38ad336e9c5fcc1dcce91deb8 SHA1 a07f7541528247a06ce0254f14ab8541ff254f83 SHA256 c53b2b1e385ef9156572edd46fceb62c2b5efee544ec98a5c6c4e1806be5081f
 MISC metadata.xml 380 RMD160 1db419c6ace42704ec134285fae7a01851af9780 SHA1 a159db2e96a5d77bad064cf61757863076bc598a SHA256 2e10ecfe504ae1d22a813720041534aadf04f25e3f6e18d3027910465b8ba4d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw8WCgACgkQCaWpQKGI+9Rc9wCeNIzM+kjp+MTN8uQiDjVdD4HK
-I3oAn06d28/V6WK6rCsYD50pJvslBiKX
-=h/Qw
+iEYEARECAAYFAkw9/5EACgkQCaWpQKGI+9QiPACfayH69q4XSDOcMWqVqXJyeyIo
+ekMAn19O9uXZ1TkzSD660aRqhQMrU9P3
+=zl63
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch
new file mode 100644
index 000000000000..37319e490af3
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch
@@ -0,0 +1,38 @@
+From a61e394d59e96267c6cef12be796f6832d212c39 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Wed, 14 Jul 2010 11:51:57 +0000
+Subject: do not link to the exiv2 extension if it's not built
+
+[bug #624326]
+---
+diff --git a/extensions/exiv2_tools/Makefile.am b/extensions/exiv2_tools/Makefile.am
+index 7bf5ae6..26a127f 100644
+--- a/extensions/exiv2_tools/Makefile.am
++++ b/extensions/exiv2_tools/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = data
+ extensiondir = $(pkglibdir)/extensions
+ extension_LTLIBRARIES = libexiv2_tools.la
+ 
+-libexiv2_tools_la_SOURCES = 			\
++libexiv2_tools_la_SOURCES = 		\
+ 	exiv2-utils.h			\
+ 	exiv2-utils.cpp			\
+ 	gth-edit-exiv2-page.c		\
+diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am
+index de5095c..87b2d06 100644
+--- a/extensions/importer/Makefile.am
++++ b/extensions/importer/Makefile.am
+@@ -45,7 +45,10 @@ libimporter_la_SOURCES = 			\
+ 
+ libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+ libimporter_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+-libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../exiv2_tools/libexiv2_tools.la ../image_rotation/libimage_rotation.la
++libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la
++if ENABLE_EXIV2
++libimporter_la_LIBADD += ../exiv2_tools/libexiv2_tools.la
++endif
+ libimporter_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
+ 
+ extensioninidir = $(extensiondir)
+--
+cgit v0.8.3.1
diff --git a/media-gfx/gthumb/gthumb-2.11.5.ebuild b/media-gfx/gthumb/gthumb-2.11.5.ebuild
index 9bab69c0c1a5..db6218593a8a 100644
--- a/media-gfx/gthumb/gthumb-2.11.5.ebuild
+++ b/media-gfx/gthumb/gthumb-2.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.11.5.ebuild,v 1.1 2010/07/13 12:12:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.11.5.ebuild,v 1.2 2010/07/14 18:18:48 pacho Exp $
 
 EAPI="3"
 
@@ -49,7 +49,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-clutter
-		$(use_enable cdr brasero)
+		$(use_enable cdr libbrasero)
 		$(use_enable exif exiv2)
 		$(use_enable gstreamer)
 		$(use_enable gnome-keyring)
@@ -66,6 +66,9 @@ src_prepare() {
 	# Do not require unstable libunique
 	epatch "${FILESDIR}/${PN}-2.11.2.1-configure.patch"
 
+	# Do not link to the exiv2 extension if it's not built
+	epatch "${FILESDIR}/${P}-configure-exiv2.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }