Version bump, support for stereoscopic images, custom tiff loader, rewritten file grouping, and merged bugfixes. Reported by Andrew Savchenko in bug #432892. Remove some 1.0 revisions

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

5 files changed, 170 insertions, 74 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index e61651dfe7e7..781a515ea0f4 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.24 2012/08/14 12:56:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.25 2012/08/28 13:45:36 voyageur Exp $
+
+*geeqie-1.1 (28 Aug 2012)
+
+  28 Aug 2012; Bernard Cafarelli <voyageur@gentoo.org> -geeqie-1.0-r1.ebuild,
+  -geeqie-1.0-r3.ebuild, +geeqie-1.1.ebuild,
+  +files/geeqie-1.1-fix_comment_update.patch:
+  Version bump, support for stereoscopic images, custom tiff loader, rewritten
+  file grouping, and merged bugfixes. Reported by Andrew Savchenko in bug
+  #432892. Remove some 1.0 revisions
 
   14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> geeqie-1.0-r4.ebuild:
   Stable for amd64, wrt bug #429116
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index f11dce04f67b..b243502d5dad 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX geeqie-1.0-automake-1.11.patch 609 SHA256 0b576ab74fbfd0c1ad2c89b6ba50521bf74550820748e13f8ed2c90dfe4097af SHA512 adcaf43d0566873620896a215bab40cc46c116b493665aa5f524f38e9689eb5f2115134409b83a107c8de813cc6f4b22f84666e2d006e68c93f6eb03ea897812 WHIRLPOOL 58e69c26858ef9e871ac23034e2bccb489febb8716eefdcaf7c28c56c48faff7d2b2a66252b31909b113a0b963ed16f47ef1f682e4e2f71b987be3cb719f3e03
 AUX geeqie-1.0-copy_chown.patch 1805 SHA256 c84815794a6cdd6be6b0ab954760013f372b6fc1084d3cd1b5cfa67beefd7ba7 SHA512 ccfb987b7575b7cd89f041380203c93c33876bd40c8c1b82331233944384382db43e90cbdb8179d69a6af8fc4df2191a240cd4c006f4495f3e0a79ef7542d6c8 WHIRLPOOL 08608c6a9e9221cb9f8e134683f24877641481a7254be3b4840c9222486f82ce1b6650eacd4b5282ce1defb17b93f154244f183d693be4e26c365b1739087779
 AUX geeqie-1.0-filedata_compare.patch 1690 SHA256 c82471f323e8b01b46eb60f2be549456e1d75f08ab5cd3bf5144e493c5222ebb SHA512 87686969b0a6441dbe12734cefcf120c5e2fb59fdac8766f853eb1dfc7bbabc57f1e49d0d420074dbb139ae574bd61670ff1f6deb1cba5996d796bc864cb32dc WHIRLPOOL 54c84082145b9e3ed94463d7572bd16617e78afbea90524e8ea0a380ec66312bdf792fcfd6421215abc71e1154e2fa6945d6932e9086d365baf8c326fdf418f9
@@ -6,10 +9,18 @@ AUX geeqie-1.0-lfs_support.patch 227 SHA256 1a12a99df42636cac424fc901bc7ce74c23b
 AUX geeqie-1.0-ui_pathsel.patch 1307 SHA256 2a42dc2a5ee4e4d5e4636d424e1adb6a707c74bde4a5ec28b24ff8fafee164ed SHA512 f17d058d1fcc6557459adf13ff44f928d0523856913b8756da4aff197e468899be3d4e279cb923e46db1348df5c40ee1ece9d8561d4ff966456f0d0f23f88197 WHIRLPOOL fd914d5281e1309b32425e631aa0701f52a440b6a558cd32a9a48871a24c489b01e37713ee94729af2d0c284d38a05771ede033304e27d3d1745f5270de98eed
 AUX geeqie-1.0-up_path_restore.patch 626 SHA256 29cdffb3d1fe2c6c4823ba55e194dac39c59f56aec7aa84814435b656d2ee27a SHA512 21a7375957050a7d5c5650475215f03f2129faef524ef9a61fdd716761e979fbb4b2c619b6d736afe84ee0340a5ebdf391cd111ca18fb7cfd0593ad8cab8abd7 WHIRLPOOL 6c57255f238b2e91d6b51fab9e8dd43c814049e27f02e744d20d397b76dfb5097fdd96af0b673479638cdb2e11999ae11524240d634ae2041558e440e80cd2ff
 AUX geeqie-1.0-vflist-refresh.patch 1968 SHA256 5f7d53a22a42ed7afcb425bf3a9bb358e40225a6a356c2b3791349a2eda67bc0 SHA512 ceb5874f895a5a0ef1e60fc97e7ec4d99c508713bffceff616839abe216b223baf3cddcc2dab431c74e75bd4a72b3ec38c9e43a018a81c46fa3bf0d949152e90 WHIRLPOOL 63b58135799dc62cd1ecd7c95ef47bd025a21687c0a15498fd9e3e13f4067441623eadffdd128cc837612387df9cc3ecc8faef55d70a609cbbbb27b1305cd344
+AUX geeqie-1.1-fix_comment_update.patch 4649 SHA256 cd1ce814ea556f51e840e36b85a2316e30f57a887531688a2b20f481a3061612 SHA512 4b6e6b25264a7b9075dc2718fb48a0eb8157f695f206a047efc94d593ed5624bd86b47f38931bee24fc8a5ec0be75f4ea51338996f8ca8be56982d5d3584a786 WHIRLPOOL 38cbfec26e7b9f477e739de87609e442439a3a1d9c2a8ba37fccff6fa77869e74e14bfbe5977cbb447cd8649e97eef98c02483cae9820eb9958a99f95b686a6d
 DIST geeqie-1.0.tar.gz 1934236 SHA256 d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd SHA512 34ad22468e1faaad8842df8c172e305149415812a9421edc590bf1717ab8ce787e55152f9348d39b69e2c5642cba5abd4e574c0b46d06bc741994bcecaa8a18a WHIRLPOOL af3406b27b491fe8836f39faf5013091a3c5b74287e94d9022b2b3cc337ce338e586fc287de90e272a284400926af97b41e32af5e6e87babc770bb1b66cddc89
-EBUILD geeqie-1.0-r1.ebuild 1392 SHA256 ff0d3de3092295bb295229d170ae9395f6b2c04648cbe34cdb7774b9f6d1f326 SHA512 7181895e148ebb5e8a4d4435252e2311f09e02a188a4a8bd74ebc474b763ccfab1aafa6c988ad0153205d913e9bc03851db723588f084c183f84663aad3d52b0 WHIRLPOOL 4ddbb85e28f3563b1e06f00f4174e57c100ab0b56a40763e2509a3d9d25a5cdbb7ec9a524114bbb07d74f7285a216f284984c2b40be23b87af6afa4c344cc7ad
+DIST geeqie-1.1.tar.gz 1966211 SHA256 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf SHA512 3949b2717c70adb4e6b2c6db002042bcd1c3e9a5345991d3cba41de1765709ccf70fadfcde9dd221b1da03ef14512c746ab424cbc0d09617c52dbf445ee0243d WHIRLPOOL 1c62611f597e08b51b0306dac2af5af1893d4c1b96726bbc6220b28d1779275516624ff3865dec0056d93a1af24edcce1a3a0f2891b954be19bab1b7d728a929
 EBUILD geeqie-1.0-r2.ebuild 1491 SHA256 3c5c690637fc5c2af2c9f3d0cf96cfacc0c838b04798b0ec1ec45c8fe67b69a7 SHA512 66000cd779775a1d58a7a9c320e81f69eb5a4324a9ad446e2c750d308215de38f5fa1bf4bfa38b502ee5dd191ace2ac5264806a8f862563277a4a7209a20869b WHIRLPOOL 38ea39359114494209978079a6008739955c45407676d56c1169dc6759f8c25df576db695699f70e091f19a8c64384d764cbaafd65311c386aeec9e50ad7c726
-EBUILD geeqie-1.0-r3.ebuild 1728 SHA256 a0df327c856d675117740b902b4fa74ce68a30a544bcbab22309cde2e9ddb69c SHA512 2b0c565c82fa55676719045c70aeb37f9af5306163890888994bb0750f96de233425fee56e95a7f898b63d6748a2c7a96fb30cc0bf2a405af0842da5a0141729 WHIRLPOOL 8da3e37df8ca0bd286aeb144b0210c3fe91d63e52b8870d77725facf57d211964e721e7f1a8eea82ff47e049a2bf7e5acf6b0714f7e7c05671c61c51e029f994
 EBUILD geeqie-1.0-r4.ebuild 1750 SHA256 4e3bd63afdc14c8f71c0d35bded8a76713ec600b9ef7c1d150dde2e4e405ef37 SHA512 5700608990cd33bd159c4e78067ccf00139229495ccc8bb9cc2f85e1c417d4372b2c811cb235f0ab338b1a9142822f75549d4de02147c9fec8efeb6549b0dbb0 WHIRLPOOL 54005260e558f7e75d9527576a181fccf64ee6e15f9975d4bd0ed20eda2cb4dcd8fed7a24fecb4d121f3ee21a3dfbf45ebce7c91b67e97c60bfa7621c03c0ec8
-MISC ChangeLog 4360 SHA256 e1e350ce5adcc0f6d4ad1301cf3b80b6cd3dbc0410a595738145dca2091c4a34 SHA512 11a7cf0bb4a82c29bc1bd0ec78510717a00a8777a54d61846a2440f8770925ba61c5f3679e863333d7603e1e31859c9402cb6abdb9f9e84c4774932492be084c WHIRLPOOL 4a81cbad1afd7d02a6ccc10c0a79fb2d629b82cc8d423df386e74cc4c30ae265b3f9fd339ebb08fc2166c433232cfc0728ab9256d80fabf59d19748cbca78d24
+EBUILD geeqie-1.1.ebuild 1570 SHA256 56a935197b5ddf8be08896e30806dfdc0e8c7934b12c5ed3cc390c9280dc7b64 SHA512 ca6be508d86417dae62ec3f0d11dceabfef7f5c3e15b18e63737fe36a7f12dc32d8d00d1c578aa4a82879481eda2dde96cf8d4acbc153d7e1848c8be7fa95f58 WHIRLPOOL 7c1974f96871ba41959fee455474f1dc54df57f8b1a5b1cd69e2b91de6b682908a1ec84d802be28a19c9ef86901918050ba54bee65c80e994a2c2964c93eb136
+MISC ChangeLog 4752 SHA256 022de07c6698db574d7d0136d99da46fd9b9406b2ae16ad594d0e18d795005cb SHA512 efb3f93cf658d5edccfb47773c63f50156b1110f80d0a6ece3eb786157af16bec87af1ce99c04051411ee796b1957fdc6b4c2f3bdf82c231f391c25872fc83cf WHIRLPOOL e244d31536b6e152a2b11658ef88eb97b6c9c79053439258a9bfb15ff7c82e441cbdb65e288fa5b2e387e4f082965ac7992149a76eb631829b647fcc12e66d0d
 MISC metadata.xml 527 SHA256 0d271c29ec180ce0cad2f6129d90fcbd562996c76d59d56063c3e29d6e68b877 SHA512 7ba8db75611e19112aeff58820af895493f9153916972ba088673afd0dc9c4e9dd894e34c4a0b8cab413e5c8f777827178e407e0153ebf5be31d5b9ad6810cd2 WHIRLPOOL 9720b49bf795bcd36b03eda5d616a913c8da455791dbd8c8e73e44e6690c7569153fc5eac942c157b8dfb9cc505bd700a88fbd0565d0c01faa2658cca5077e34
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlA8y5QACgkQFYEBGcdFJfL/FQD8DWscyqvaQZoJExCqg5KDoN6A
+jVNvqxqtT445Iy7lMN0BAKOVggmNIYXG9cjEBRBX48jxclYbOLhk4Aa3Mb6WchTO
+=bcsm
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch b/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch
new file mode 100644
index 000000000000..42ef9ff40901
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch
@@ -0,0 +1,129 @@
+From 085be43cb79e04341102a9922e0e0f531454089a Mon Sep 17 00:00:00 2001
+From: Vladimir Nadvornik <nadvornik@suse.cz>
+Date: Tue, 21 Aug 2012 20:39:03 +0200
+Subject: [PATCH] fixed updating of comment and keyword pane
+
+- temporary disabling of notifications does no longer work because
+the notification is called later, in idle cb.
+- regression introduced in 78cde6934008f79fe498e4adc64d187b0ed47417
+- now the update function checks if the new value is really different
+---
+ src/bar_comment.c  |   20 ++++++++++++--------
+ src/bar_keywords.c |   37 +++++++++++++++++++++++--------------
+ 2 files changed, 35 insertions(+), 22 deletions(-)
+
+diff --git a/src/bar_comment.c b/src/bar_comment.c
+index e63695b..156ab6e 100644
+--- a/src/bar_comment.c
++++ b/src/bar_comment.c
+@@ -60,16 +60,22 @@ static void bar_pane_comment_write(PaneCommentData *pcd)
+ static void bar_pane_comment_update(PaneCommentData *pcd)
+ {
+ 	gchar *comment = NULL;
++	gchar *orig_comment = NULL;
++	gchar *comment_not_null;
+ 	GtkTextBuffer *comment_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pcd->comment_view));
+ 
+-	g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+-
++	orig_comment = text_widget_text_pull(pcd->comment_view);
+ 	comment = metadata_read_string(pcd->fd, pcd->key, METADATA_PLAIN);
+-	gtk_text_buffer_set_text(comment_buffer,
+-				 (comment) ? comment : "", -1);
+-	g_free(comment);
++	comment_not_null = (comment) ? comment : "";
+ 	
+-	g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
++	if (strcmp(orig_comment, comment_not_null) != 0)
++		{
++		g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
++		gtk_text_buffer_set_text(comment_buffer, comment_not_null, -1);
++		g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
++		}
++	g_free(comment);
++	g_free(orig_comment);
+ 
+ 	gtk_widget_set_sensitive(pcd->comment_view, (pcd->fd != NULL));
+ }
+@@ -177,9 +183,7 @@ static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data)
+ {
+ 	PaneCommentData *pcd = data;
+ 
+-	file_data_unregister_notify_func(bar_pane_comment_notify_cb, pcd);
+ 	bar_pane_comment_write(pcd);
+-	file_data_register_notify_func(bar_pane_comment_notify_cb, pcd, NOTIFY_PRIORITY_LOW);
+ }
+ 
+ 
+diff --git a/src/bar_keywords.c b/src/bar_keywords.c
+index df70fda..257915e 100644
+--- a/src/bar_keywords.c
++++ b/src/bar_keywords.c
+@@ -216,17 +216,33 @@ static void bar_pane_keywords_keyword_update_all(void)
+ static void bar_pane_keywords_update(PaneKeywordsData *pkd)
+ {
+ 	GList *keywords = NULL;
++	GList *orig_keywords = NULL;
++	GList *work1, *work2;
+ 	GtkTextBuffer *keyword_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pkd->keyword_view));
+ 
+-	g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+-
+ 	keywords = metadata_read_list(pkd->fd, KEYWORD_KEY, METADATA_PLAIN);
+-	keyword_list_push(pkd->keyword_view, keywords);
+-	bar_keyword_tree_sync(pkd);
+-	string_list_free(keywords);
+-	
+-	g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
++	orig_keywords = keyword_list_pull(pkd->keyword_view);
+ 
++	/* compare the lists */
++	work1 = keywords;
++	work2 = orig_keywords;
++	
++	while (work1 && work2)
++		{
++		if (strcmp(work1->data, work2->data) != 0) break;
++		work1 = work1->next;
++		work2 = work2->next;
++		}
++	
++	if (work1 || work2) /* lists differs */
++		{
++		g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
++		keyword_list_push(pkd->keyword_view, keywords);
++		bar_keyword_tree_sync(pkd);
++		g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
++		}
++	string_list_free(keywords);
++	string_list_free(orig_keywords);
+ }
+ 
+ void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
+@@ -426,10 +442,8 @@ static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
+ {
+ 	PaneKeywordsData *pkd = data;
+ 
+-	file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
+ 	bar_pane_keywords_write(pkd);
+ 	bar_keyword_tree_sync(pkd);
+-	file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
+ 	pkd->idle_id = 0;
+ 	return FALSE;
+ }
+@@ -962,12 +976,7 @@ static void bar_pane_keywords_connect_mark_cb(GtkWidget *menu_widget, gpointer d
+ 
+ 	gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &kw_iter, &iter);
+ 
+-	file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
+-
+ 	meta_data_connect_mark_with_keyword(keyword_tree, &kw_iter, mark);
+-
+-	file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
+-//	bar_pane_keywords_update(pkd);
+ }
+ 
+ 
+-- 
+1.7.10
+
diff --git a/media-gfx/geeqie/geeqie-1.0-r3.ebuild b/media-gfx/geeqie/geeqie-1.0-r3.ebuild
deleted file mode 100644
index 936b81e0c004..000000000000
--- a/media-gfx/geeqie/geeqie-1.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r3.ebuild,v 1.1 2012/06/07 23:08:30 voyageur Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc exif lcms lirc xmp"
-
-RDEPEND="x11-libs/gtk+:2
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	lcms? ( =media-libs/lcms-1* )
-	lirc? ( app-misc/lirc )
-	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake-1.11.patch
-	epatch "${FILESDIR}"/${P}-copy_chown.patch
-	epatch "${FILESDIR}"/${P}-filedata_compare.patch
-	epatch "${FILESDIR}"/${P}-fix_fullscreen.patch
-	epatch "${FILESDIR}"/${P}-lfs_support.patch
-	epatch "${FILESDIR}"/${P}-ui_pathsel.patch
-	epatch "${FILESDIR}"/${P}-vflist-refresh.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		$(use_enable lcms)
-		$(use_enable lirc)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}/usr/share/doc/${MY_P}/COPYING"
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/geeqie/geeqie-1.0-r1.ebuild b/media-gfx/geeqie/geeqie-1.1.ebuild
index e6d739ad4687..e1e8f6b04219 100644
--- a/media-gfx/geeqie/geeqie-1.0-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r1.ebuild,v 1.9 2012/05/05 07:00:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.1.ebuild,v 1.1 2012/08/28 13:45:36 voyageur Exp $
 
-EAPI=2
+EAPI=4
+inherit autotools base eutils
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://geeqie.sourceforge.net/"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc exif lcms lirc xmp"
 
 RDEPEND="x11-libs/gtk+:2
@@ -25,6 +26,17 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-automake-1.11.patch
+	"${FILESDIR}"/${PN}-1.0-fix_fullscreen.patch
+	"${FILESDIR}"/${P}-fix_comment_update.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	local myconf="--disable-dependency-tracking
 		--with-readmedir=/usr/share/doc/${PF}
@@ -37,11 +49,11 @@ src_configure() {
 		myconf="${myconf} --disable-exiv2"
 	fi
 
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	rm -f "${D}/usr/share/doc/${MY_P}/COPYING"
 }