Allow use of alternate jpeg implementation.

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

9 files changed, 14 insertions, 555 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 4ddaa70b576f..62c8192adb5e 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.117 2010/09/28 19:04:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.118 2010/11/08 22:27:27 eva Exp $
+
+  08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> gthumb-2.10.11.ebuild,
+  -files/gthumb-2.11.2.1-configure.patch, -gthumb-2.11.5-r1.ebuild,
+  -files/gthumb-2.11.5-configure-exiv2.patch,
+  -files/gthumb-2.11.5-exif-rotation.patch,
+  -files/gthumb-2.11.5-jpeg8-rotation.patch, -gthumb-2.11.6.ebuild,
+  gthumb-2.12.0.ebuild:
+  Allow use of alternate jpeg implementation.
 
 *gthumb-2.12.0 (28 Sep 2010)
 
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
deleted file mode 100644
index 6eee22d09722..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/files/gthumb-2.11.5-configure-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch
deleted file mode 100644
index 37319e490af3..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.11.5-configure-exiv2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/gthumb-2.11.5-exif-rotation.patch b/media-gfx/gthumb/files/gthumb-2.11.5-exif-rotation.patch
deleted file mode 100644
index aa49ab47282b..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.11.5-exif-rotation.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From c200cbf310109cba991bafa38d521c7a1af31360 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Fri, 16 Jul 2010 13:52:54 +0000
-Subject: preserve the exif data after a lossless rotation
-
-read the exif data from the input buffer to make sure that they are
-read correctly, instead of reading them from the output buffer after
-the transformation.
----
-diff --git a/extensions/exiv2_tools/main.c b/extensions/exiv2_tools/main.c
-index a8dcf74..87dd411 100644
---- a/extensions/exiv2_tools/main.c
-+++ b/extensions/exiv2_tools/main.c
-@@ -24,6 +24,7 @@
- #include <config.h>
- #include <gtk/gtk.h>
- #include <gthumb.h>
-+#include <extensions/jpeg_utils/jpegtran.h>
- #include "gth-edit-exiv2-page.h"
- #include "gth-metadata-provider-exiv2.h"
- #include "exiv2-utils.h"
-@@ -167,21 +168,19 @@ update_exif_dimensions (GFileInfo    *info,
- 
- 
- static void
--exiv2_jpeg_tran_cb (void         **out_buffer,
--		    gsize         *out_buffer_size,
--		    GthTransform  *transform)
-+exiv2_jpeg_tran_cb (JpegTranInfo *tran_info)
- {
- 	GFileInfo *info;
- 
- 	info = g_file_info_new ();
--	if (exiv2_read_metadata_from_buffer (*out_buffer, *out_buffer_size, info, NULL)) {
-+	if (exiv2_read_metadata_from_buffer (tran_info->in_buffer, tran_info->in_buffer_size, info, NULL)) {
- 		GthMetadata *metadata;
- 
--		update_exif_dimensions (info, *transform);
-+		update_exif_dimensions (info, tran_info->transformation);
- 
- 		metadata = g_object_new (GTH_TYPE_METADATA, "raw", "1", NULL);
- 		g_file_info_set_attribute_object (info, "Exif::Image::Orientation", G_OBJECT (metadata));
--		exiv2_write_metadata_to_buffer (out_buffer, out_buffer_size, info, NULL, NULL);
-+		exiv2_write_metadata_to_buffer (tran_info->out_buffer, tran_info->out_buffer_size, info, NULL, NULL);
- 
- 		g_object_unref (metadata);
- 	}
-diff --git a/extensions/image_rotation/main.c b/extensions/image_rotation/main.c
-index 321ce7e..6a1195c 100644
---- a/extensions/image_rotation/main.c
-+++ b/extensions/image_rotation/main.c
-@@ -33,11 +33,10 @@ gthumb_extension_activate (void)
- 	/**
- 	 * Called after successfully rotating a jpeg image
- 	 *
--	 * @out_buffer (void **): pointer to file data
--	 * @out_buffer_size (gsize *): pointer to file data size
--	 * @tranform (GthTransform *): the transformation applied to the file
-+	 * @info (JpegTranInfo *): the transformation info as described in
-+	 * extensions/jpeg_utils/jpegtran.h
- 	 **/
--	gth_hook_register ("jpegtran-after", 3);
-+	gth_hook_register ("jpegtran-after", 1);
- 
- 	gth_hook_add_callback ("gth-browser-construct", 10, G_CALLBACK (ir__gth_browser_construct_cb), NULL);
- 	gth_hook_add_callback ("gth-browser-update-sensitivity", 10, G_CALLBACK (ir__gth_browser_update_sensitivity_cb), NULL);
-diff --git a/extensions/jpeg_utils/jpegtran.c b/extensions/jpeg_utils/jpegtran.c
-index 1aa302d..5484983 100644
---- a/extensions/jpeg_utils/jpegtran.c
-+++ b/extensions/jpeg_utils/jpegtran.c
-@@ -222,7 +222,6 @@ jpegtran_internal (struct jpeg_decompress_struct  *srcinfo,
- 	/* Initialize destination compression parameters from source values */
- 	jpeg_copy_critical_parameters (srcinfo, dstinfo);
- 
--
- 	/* Do not output a JFIF marker for EXIF thumbnails.
- 	 * This is not the optimal way to detect the difference
- 	 * between a thumbnail and a normal image, but it works
-@@ -230,13 +229,6 @@ jpegtran_internal (struct jpeg_decompress_struct  *srcinfo,
- 	if (option == JCOPYOPT_NONE)
- 		dstinfo->write_JFIF_header = FALSE;
- 
--#if JPEG_LIB_VERSION < 80
--	/* Adjust the markers to create a standard EXIF file if an EXIF marker
--	 * is present in the input. By default, libjpeg creates a JFIF file,
--	 * which is incompatible with the EXIF standard. */
--	jcopy_markers_exif (srcinfo, dstinfo, option);
--#endif
--
- 	/* Adjust destination parameters if required by transform options;
- 	 * also find out which set of coefficient arrays will hold the output.
- 	 */
-@@ -336,7 +328,14 @@ jpegtran (void           *in_buffer,
- 	jpeg_destroy_decompress (&srcinfo);
- 
- 	if (success) {
--		gth_hook_invoke ("jpegtran-after", out_buffer, out_buffer_size, &transformation);
-+		JpegTranInfo info;
-+
-+		info.in_buffer = in_buffer;
-+		info.in_buffer_size = in_buffer_size;
-+		info.out_buffer = out_buffer;
-+		info.out_buffer_size = out_buffer_size;
-+		info.transformation = transformation;
-+		gth_hook_invoke ("jpegtran-after", &info);
- 	}
- 	else {
- 		g_free (*out_buffer);
-diff --git a/extensions/jpeg_utils/jpegtran.h b/extensions/jpeg_utils/jpegtran.h
-index 6c26139..80bafbe 100644
---- a/extensions/jpeg_utils/jpegtran.h
-+++ b/extensions/jpeg_utils/jpegtran.h
-@@ -46,6 +46,15 @@ typedef enum {
- } JpegMcuAction;
- 
- 
-+typedef struct {
-+	void          *in_buffer;
-+	gsize          in_buffer_size;
-+	void         **out_buffer;
-+	gsize         *out_buffer_size;
-+	GthTransform   transformation;
-+} JpegTranInfo;
-+
-+
- gboolean   jpegtran  (void           *in_buffer,
- 		      gsize           in_buffer_size,
- 		      void          **out_buffer,
-diff --git a/extensions/jpeg_utils/transupp.h b/extensions/jpeg_utils/transupp.h
-index 104fa2e..5f0f69b 100644
---- a/extensions/jpeg_utils/transupp.h
-+++ b/extensions/jpeg_utils/transupp.h
-@@ -20,6 +20,8 @@
-  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <config.h>
-+
- #ifdef HAVE_LIBJPEG
- 
- #include <jpeglib.h>
---
-cgit v0.8.3.1
diff --git a/media-gfx/gthumb/files/gthumb-2.11.5-jpeg8-rotation.patch b/media-gfx/gthumb/files/gthumb-2.11.5-jpeg8-rotation.patch
deleted file mode 100644
index 12a6ab52452f..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.11.5-jpeg8-rotation.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 607d43534519c2fcb7ad079b634d47e4ba22376e Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Fri, 16 Jul 2010 13:49:43 +0000
-Subject: fixed lossless rotation with libjpeg8
-
-Simplified the jpeg memory source implementation. Copied the
-from the libjpeg8 source. This fixes a bug with the
-skip_input_data function implementation as well.
-
-[bug #612809]
----
-diff --git a/extensions/jpeg_utils/jmemorysrc.c b/extensions/jpeg_utils/jmemorysrc.c
-index f6dc7a8..b8c2ca6 100644
---- a/extensions/jpeg_utils/jmemorysrc.c
-+++ b/extensions/jpeg_utils/jmemorysrc.c
-@@ -29,73 +29,62 @@
- #include <gio/gio.h>
- 
- 
--#define TMP_BUF_SIZE  4096
- #define JPEG_ERROR(cinfo,code)  \
-   ((cinfo)->err->msg_code = (code), \
-    (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
- 
- 
--typedef struct {
--	struct jpeg_source_mgr pub;
--
--	JOCTET  *in_buffer;
--	gsize    in_buffer_size;
--	goffset  bytes_read;
--	JOCTET  *tmp_buffer;
--} mem_source_mgr;
--
--typedef mem_source_mgr * mem_src_ptr;
--
--
- static void
- init_source (j_decompress_ptr cinfo)
- {
--	mem_src_ptr src = (mem_src_ptr) cinfo->src;
--	src->bytes_read = 0;
-+	/* void */
- }
- 
- 
- static gboolean
- fill_input_buffer (j_decompress_ptr cinfo)
- {
--	mem_src_ptr src = (mem_src_ptr) cinfo->src;
--	size_t      nbytes;
--
--	if (src->bytes_read + TMP_BUF_SIZE > src->in_buffer_size)
--		nbytes = src->in_buffer_size - src->bytes_read;
--	else
--		nbytes = TMP_BUF_SIZE;
--
--	if (nbytes <= 0) {
--		if (src->bytes_read == 0)
--			JPEG_ERROR (cinfo, G_IO_ERROR_NOT_FOUND);
--
--		/* Insert a fake EOI marker */
--		src->tmp_buffer[0] = (JOCTET) 0xFF;
--		src->tmp_buffer[1] = (JOCTET) JPEG_EOI;
--		nbytes = 2;
--	}
--	else
--		memcpy (src->tmp_buffer, src->in_buffer + src->bytes_read, nbytes);
-+	static JOCTET mybuffer[4];
-+
-+	/* The whole JPEG data is expected to reside in the supplied memory
-+	 * buffer, so any request for more data beyond the given buffer size
-+	 * is treated as an error.
-+	 */
-+
-+	JPEG_ERROR (cinfo, G_IO_ERROR_NOT_FOUND);
- 
--	src->pub.next_input_byte = src->tmp_buffer;
--	src->pub.bytes_in_buffer = nbytes;
--	src->bytes_read += nbytes;
-+	/* Insert a fake EOI marker */
-+	mybuffer[0] = (JOCTET) 0xFF;
-+	mybuffer[1] = (JOCTET) JPEG_EOI;
-+
-+	cinfo->src->next_input_byte = mybuffer;
-+	cinfo->src->bytes_in_buffer = 2;
- 
- 	return TRUE;
- }
- 
- 
--static void
-+void
- skip_input_data (j_decompress_ptr cinfo,
- 		 long             num_bytes)
- {
--	mem_src_ptr src = (mem_src_ptr) cinfo->src;
--
--	src->bytes_read += num_bytes;
--	if (src->bytes_read < 0)
--		src->bytes_read = 0;
--	fill_input_buffer (cinfo);
-+	struct jpeg_source_mgr * src = cinfo->src;
-+
-+	/* Just a dumb implementation for now.  Could use fseek() except
-+	 * it doesn't work on pipes.  Not clear that being smart is worth
-+	 * any trouble anyway --- large skips are infrequent.
-+	 */
-+	if (num_bytes > 0) {
-+		while (num_bytes > (long) src->bytes_in_buffer) {
-+			num_bytes -= (long) src->bytes_in_buffer;
-+			(void) fill_input_buffer (cinfo);
-+			/* note we assume that fill_input_buffer will never return FALSE,
-+			 * so suspension need not be handled.
-+			 */
-+		}
-+		src->next_input_byte += (size_t) num_bytes;
-+		src->bytes_in_buffer -= (size_t) num_bytes;
-+	}
- }
- 
- 
-@@ -111,28 +100,21 @@ _jpeg_memory_src (j_decompress_ptr  cinfo,
- 		  void             *in_buffer,
- 		  gsize             in_buffer_size)
- {
--	mem_src_ptr src;
-+	struct jpeg_source_mgr *src;
- 
- 	if (cinfo->src == NULL) {
- 		cinfo->src = (struct jpeg_source_mgr *)
- 			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
- 						    JPOOL_PERMANENT,
--						    sizeof (mem_source_mgr));
--		src = (mem_src_ptr) cinfo->src;
--		src->tmp_buffer = (JOCTET *)
--			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
--						    JPOOL_PERMANENT,
--						    TMP_BUF_SIZE * sizeof(JOCTET));
-+						    sizeof (struct jpeg_source_mgr));
- 	}
- 
--	src = (mem_src_ptr) cinfo->src;
--	src->pub.init_source = init_source;
--	src->pub.fill_input_buffer = fill_input_buffer;
--	src->pub.skip_input_data = skip_input_data;
--	src->pub.resync_to_restart = jpeg_resync_to_restart;
--	src->pub.term_source = term_source;
--	src->in_buffer = (JOCTET *) in_buffer;
--	src->in_buffer_size = in_buffer_size;
--	src->pub.bytes_in_buffer = 0;
--	src->pub.next_input_byte = NULL;
-+	src = cinfo->src;
-+	src->init_source = init_source;
-+	src->fill_input_buffer = fill_input_buffer;
-+	src->skip_input_data = skip_input_data;
-+	src->resync_to_restart = jpeg_resync_to_restart;
-+	src->term_source = term_source;
-+	src->bytes_in_buffer = (size_t) in_buffer_size;
-+	src->next_input_byte = (JOCTET *) in_buffer;
- }
-diff --git a/extensions/jpeg_utils/jpegtran.c b/extensions/jpeg_utils/jpegtran.c
-index 8a1721b..1aa302d 100644
---- a/extensions/jpeg_utils/jpegtran.c
-+++ b/extensions/jpeg_utils/jpegtran.c
-@@ -188,6 +188,9 @@ jpegtran_internal (struct jpeg_decompress_struct  *srcinfo,
- 	transformoption.transform = transform;
- 	transformoption.trim = (mcu_action == JPEG_MCU_ACTION_TRIM);
- 	transformoption.force_grayscale = FALSE;
-+#if JPEG_LIB_VERSION >= 80
-+	transformoption.crop = 0;
-+#endif
- 
- 	/* Enable saving of extra markers that we want to copy */
- 	jcopy_markers_setup (srcinfo, option);
---
-cgit v0.8.3.1
diff --git a/media-gfx/gthumb/gthumb-2.10.11.ebuild b/media-gfx/gthumb/gthumb-2.10.11.ebuild
index 4747df535d6b..245ccdb2313c 100644
--- a/media-gfx/gthumb/gthumb-2.10.11.ebuild
+++ b/media-gfx/gthumb/gthumb-2.10.11.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.10.11.ebuild,v 1.7 2010/05/15 17:05:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.11.ebuild,v 1.8 2010/11/08 22:27:27 eva Exp $
 
 EAPI=2
 inherit gnome2
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.6:2
 	>=gnome-base/libbonobo-2.6
 	>=gnome-base/libbonoboui-2.6
 	>=gnome-base/gconf-2.6
-	media-libs/jpeg
+	virtual/jpeg:0
 	tiff? ( media-libs/tiff )
 	raw? ( media-libs/libopenraw )
 	x11-libs/libXrender
diff --git a/media-gfx/gthumb/gthumb-2.11.5-r1.ebuild b/media-gfx/gthumb/gthumb-2.11.5-r1.ebuild
deleted file mode 100644
index 5b42d82bc096..000000000000
--- a/media-gfx/gthumb/gthumb-2.11.5-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/07/18 18:06:07 pacho Exp $
-
-EAPI="3"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
-
-# clutter
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.6
-	>=dev-libs/libunique-1
-	>=media-libs/jpeg-8:0
-	cdr? ( >=app-cdr/brasero-2.28 )
-	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 )
-	slideshow? (
-		>=media-libs/clutter-1:1.0
-		>=media-libs/clutter-gtk-0.10:1.0 )
-	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
-	gnome-base/gnome-common
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-clutter
-		$(use_enable cdr libbrasero)
-		$(use_enable exif exiv2)
-		$(use_enable gstreamer)
-		$(use_enable gnome-keyring)
-		$(use_enable http libsoup)
-		$(use_enable raw libopenraw)
-		$(use_enable slideshow clutter)
-		$(use_enable test test-suite)
-		$(use_enable tiff)"
-}
-
-src_prepare() {
-	gnome2_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"
-
-	# Fixed lossless rotation with libjpeg8
-	epatch "${FILESDIR}/${P}-jpeg8-rotation.patch"
-
-	# Preserve the exif data after a lossless rotation
-	epatch "${FILESDIR}/${P}-exif-rotation.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/gthumb-2.11.6.ebuild b/media-gfx/gthumb/gthumb-2.11.6.ebuild
deleted file mode 100644
index 9ffd8d807b20..000000000000
--- a/media-gfx/gthumb/gthumb-2.11.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.6.ebuild,v 1.1 2010/08/31 21:32:33 eva Exp $
-
-EAPI="3"
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2.6
-	>=dev-libs/libunique-1.1.2
-	>=media-libs/jpeg-8:0
-	cdr? ( >=app-cdr/brasero-2.28 )
-	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 )
-	slideshow? (
-		>=media-libs/clutter-1:1.0
-		>=media-libs/clutter-gtk-0.10:1.0 )
-	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 )"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable cdr libbrasero)
-		$(use_enable exif exiv2)
-		$(use_enable gstreamer)
-		$(use_enable gnome-keyring)
-		$(use_enable http libsoup)
-		$(use_enable raw libopenraw)
-		$(use_enable slideshow clutter)
-		$(use_enable test test-suite)
-		$(use_enable tiff)"
-}
-
-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/gthumb-2.12.0.ebuild b/media-gfx/gthumb/gthumb-2.12.0.ebuild
index a77801d54ce8..c33ac3169390 100644
--- a/media-gfx/gthumb/gthumb-2.12.0.ebuild
+++ b/media-gfx/gthumb/gthumb-2.12.0.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.12.0.ebuild,v 1.1 2010/09/28 19:04:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.0.ebuild,v 1.2 2010/11/08 22:27:27 eva Exp $
 
 EAPI="3"
 
@@ -19,8 +19,8 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.20:2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/libunique-1.1.2
-	>=media-libs/jpeg-8:0
 	media-libs/libpng:0
+	virtual/jpeg:0
 	cdr? ( >=app-cdr/brasero-2.28 )
 	exif? ( >=media-gfx/exiv2-0.18 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
@@ -73,5 +73,5 @@ src_install() {
 	gnome2_src_install
 
 	# gthumb does not need *.la files
-	find "${D}" -name "*.la" -delete || die "*.la files removal failed"
+	find "${ED}" -name "*.la" -delete || die "*.la files removal failed"
 }