Version bump, fixes usage of libjpeg, bug #306341.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

4 files changed, 118 insertions, 8 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 2e08a7e1ff40..13f039efe151 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gthumb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.103 2009/05/23 16:08:58 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.104 2010/03/08 22:41:51 eva Exp $
+
+*gthumb-2.11.2.1 (08 Mar 2010)
+
+  08 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +gthumb-2.11.2.1.ebuild, +files/gthumb-2.11.2.1-configure.patch,
+  metadata.xml:
+  Version bump, fixes usage of libjpeg, bug #306341.
 
   23 May 2009; Samuli Suominen <ssuominen@gentoo.org> gthumb-2.10.11.ebuild:
   Remove comment about unused gtkunique depend wrt #268722, which has been
diff --git a/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch b/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch
new file mode 100644
index 000000000000..6eee22d09722
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch
@@ -0,0 +1,37 @@
+From 62639364a104859e693cfe3a52f1555db646c08e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 8 Mar 2010 22:49:04 +0100
+Subject: [PATCH] Revert "fix build problems with libunique and -DGTK_DISABLE_SINGLE_INCLUDES compiler flag"
+
+Gentoo: This is not a problem as we do not compile with deprecated code
+directives.
+
+This reverts commit e494be096231cc676cebf23cc4f28dddda6e8d1a.
+---
+ configure.ac |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aaddb1..cd956ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,6 @@ CLUTTER_REQUIRED=1.0.0
+ CLUTTER_GTK_REQUIRED=0.10.0
+ GSTREAMER_REQUIRED=0.10
+ OPENRAW_REQUIRED=0.0.8
+-UNIQUE_REQUIRED=1.1.2
+ LIBSOUP_REQUIRED=2.26
+ GNOME_KEYRING_REQUIRED=2.28
+ 
+@@ -120,7 +119,7 @@ PKG_CHECK_MODULES(GTHUMB, [
+ 	gio-unix-2.0
+ 	gtk+-2.0 		>= $GTK_REQUIRED
+ 	gconf-2.0 		>= $GCONF_REQUIRED
+-	unique-1.0		>= $UNIQUE_REQUIRED
++	unique-1.0
+ ])
+ AC_SUBST(GTHUMB_LIBS)
+ AC_SUBST(GTHUMB_CFLAGS)
+-- 
+1.7.0
+
diff --git a/media-gfx/gthumb/gthumb-2.11.2.1.ebuild b/media-gfx/gthumb/gthumb-2.11.2.1.ebuild
new file mode 100644
index 000000000000..9e0279e102b0
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.11.2.1.ebuild
@@ -0,0 +1,67 @@
+# 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.2.1.ebuild,v 1.1 2010/03/08 22:41:51 eva Exp $
+
+EAPI=2
+inherit autotools eutils gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="http://gthumb.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="exif gnome-keyring http raw tiff test"
+
+# clutter
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.16:2
+	>=gnome-base/gconf-2.6
+	>=dev-libs/libunique-1
+	media-libs/jpeg
+	exif? ( >=media-gfx/exiv2-0.18 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	http? (
+		>=net-libs/libsoup-2.26:2.4
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+	tiff? ( media-libs/tiff )
+	raw? ( >=media-libs/libopenraw-0.0.8 )
+	!raw? ( media-gfx/dcraw )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	app-text/gnome-doc-utils
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-clutter
+		$(use_enable exif exiv2)
+		$(use_enable http libsoup)
+		$(use_enable raw libopenraw)
+		$(use_enable test test-suite)
+		$(use_enable tiff)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not require unstable libunique
+	epatch "${FILESDIR}/${P}-configure.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	# gthumb does not need *.la files
+	find "${D}" -name "*.la" -delete || die "*.la files removal failed"
+}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index f1edf294bf85..671189e15a2d 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name='iptc'>
-		Add support for IPTC metadata
-	</flag>
-</use>
+	<herd>gnome</herd>
+	<use>
+		<flag name='iptc'>Add support for IPTC metadata</flag>
+		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
+	</use>
 </pkgmetadata>