Version bump, remove old.

(Portage version: 2.1.10.27/cvs/Linux x86_64)

3 files changed, 20 insertions, 76 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 8e17cbe1cc6d..830694bd0121 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.133 2011/10/05 17:50:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.134 2011/10/16 10:17:03 pacho Exp $
+
+*gthumb-2.12.4 (16 Oct 2011)
+
+  16 Oct 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/gthumb-2.12.1-new-exiv2.patch, -gthumb-2.12.2.ebuild,
+  +gthumb-2.12.4.ebuild:
+  Version bump, remove old.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> gthumb-2.12.3.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch
deleted file mode 100644
index e8499b269cbc..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1834cea61050e476e97e3831538169a40af8a72f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 20 Dec 2010 03:19:12 +0000
-Subject: Enable building with exiv2-0.21 (#349150)
-
-Due to API changes in exiv2-0.21 (see
-http://dev.exiv2.org/issues/show/0000721), gthumb with exiv2 support
-enabled fails to compile. This patch updates gthumb to allow compilation
-with both exiv2-0.20 and 0.21. Since ifd IDs are no longer part of the
-public API, the patch uses group names instead (which works with
-exiv2-0.20 as well, modulo the fact that 0.21 has isMakerGroup() instead
-of isMakerIfd() in 0.20).
-In addition, instead of numeric comparison with ids1Id (which wouldn't
-work with exiv2-0.21 in any case), isMakerGroup()/isMakerIfd() are now
-used to determine whether or not a tag is a MakerNote.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
-diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
-index 780bf29..f24b50d 100644
---- a/extensions/exiv2_tools/exiv2-utils.cpp
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp
-@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
- static const char *
- get_exif_default_category (const Exiv2::Exifdatum &md)
- {
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+	if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-+#else
- 	if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-+#endif
- 		return "Exif::MakerNotes";
- 
--	switch (md.ifdId()) {
--	case Exiv2::ifd1Id:
-+	if (md.groupName().compare("Thumbnail") == 0)
- 		return "Exif::Thumbnail";
--	case Exiv2::gpsIfdId:
-+	else if (md.groupName().compare("GPSInfo") == 0)
- 		return "Exif::GPS";
--	case Exiv2::iopIfdId:
-+	else if (md.groupName().compare("Iop") == 0)
- 		return "Exif::Versions";
--	default:
--		break;
--	}
- 
- 	return "Exif::Other";
- }
-@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr  image,
- 			stringstream description;
- 			if (! md->tagLabel().empty())
- 				description << md->tagLabel();
--			else if (md->ifdId () > Exiv2::ifd1Id)
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+			else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
-+#else
-+			else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-+#endif
- 				// Must be a MakerNote - include group name
- 				description << md->groupName() << "." << md->tagName();
- 			else
---
-cgit v0.8.3.1
diff --git a/media-gfx/gthumb/gthumb-2.12.2.ebuild b/media-gfx/gthumb/gthumb-2.12.4.ebuild
index b88e033af8e6..88bb7fa6850d 100644
--- a/media-gfx/gthumb/gthumb-2.12.2.ebuild
+++ b/media-gfx/gthumb/gthumb-2.12.4.ebuild
@@ -1,28 +1,30 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.2.ebuild,v 1.6 2011/03/22 19:36:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.4.ebuild,v 1.1 2011/10/16 10:17:03 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
+HOMEPAGE="http://live.gnome.org/gthumb"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
 
-# TODO: beware, can link to brasero-3
+# We can't link against libbrasero-burn3
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.20:2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/libunique-1.1.2:1
 	media-libs/libpng:0
 	virtual/jpeg:0
-	cdr? ( >=app-cdr/brasero-2.28 )
+	cdr? ( >=app-cdr/brasero-2.28
+		<app-cdr/brasero-2.90 )
 	exif? ( >=media-gfx/exiv2-0.18 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
 	gstreamer? (
@@ -67,11 +69,10 @@ src_prepare() {
 
 	# Remove unwanted CFLAGS added with USE=debug
 	sed 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac configure || die
-}
 
-src_install() {
-	gnome2_src_install
+	# Avoid linking to libbrasero-burn3
+	epatch "${FILESDIR}/${PN}-no-brasero3.patch"
 
-	# gthumb does not need *.la files
-	find "${ED}" -name "*.la" -delete || die "*.la files removal failed"
+	# GSeal doesn't get disabled with --disable-gseal
+	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
 }