Remove unnecessary patch. Fix the ebuild not to use non-existing patches. Add missing [introspection] deps.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 11 insertions, 142 deletions

diff --git a/media-gfx/entangle/ChangeLog b/media-gfx/entangle/ChangeLog
index 3b643ded3665..be05f47ba5e7 100644
--- a/media-gfx/entangle/ChangeLog
+++ b/media-gfx/entangle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/entangle
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.10 2014/12/30 19:12:20 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.11 2015/01/10 10:56:06 mgorny Exp $
+
+  10 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  -files/entangle-0.5.0+libgphoto2-2.5.0.patch, entangle-0.6.0.ebuild:
+  Remove unnecessary patch. Fix the ebuild not to use non-existing patches. Add
+  missing [introspection] deps.
 
 *entangle-0.6.0 (30 Dec 2014)
 
diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild b/media-gfx/entangle/entangle-0.6.0.ebuild
index 8987b1d8a273..0ab3d0a556f0 100644
--- a/media-gfx/entangle/entangle-0.6.0.ebuild
+++ b/media-gfx/entangle/entangle-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/entangle-0.6.0.ebuild,v 1.1 2014/12/30 19:12:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/entangle-0.6.0.ebuild,v 1.2 2015/01/10 10:56:06 mgorny Exp $
 
 EAPI=5
 
@@ -17,14 +17,14 @@ IUSE=""
 
 DEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gdk-pixbuf-2.12.0:2
-	>=x11-libs/gtk+-3.3.18:3
+	>=x11-libs/gtk+-3.3.18:3[introspection]
 	virtual/libgudev:=
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/gobject-introspection-0.9.3
 	>=media-libs/libgphoto2-2.4.11:=
 	media-libs/lcms:2
 	>=dev-libs/libpeas-1.2.0[gtk]
-	>=media-libs/gexiv2-0.4
+	>=media-libs/gexiv2-0.4[introspection]
 	>=x11-libs/libXext-1.3.0
 	>=x11-themes/gnome-icon-theme-symbolic-3.0.0
 	>=media-libs/libraw-0.9.0"
@@ -40,10 +40,3 @@ G2CONF+="
 	--disable-static"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	gnome2_src_prepare
-
-	has_version '>=media-libs/libgphoto2-2.5.0' && \
-		epatch "${FILESDIR}"/${P}+libgphoto2-2.5.0.patch
-}
diff --git a/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch b/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch
deleted file mode 100644
index 83013be446c4..000000000000
--- a/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: entangle-0.5.0/configure.ac
-===================================================================
---- entangle-0.5.0.orig/configure.ac
-+++ entangle-0.5.0/configure.ac
-@@ -28,7 +28,7 @@ GDK_PIXBUF_REQUIRED=2.12.0
- AC_SUBST(GDK_PIXBUF_REQUIRED)
- GTK_REQUIRED=3.0.0
- AC_SUBST(GTK_REQUIRED)
--GPHOTO2_REQUIRED=2.4.11
-+GPHOTO2_REQUIRED=2.5.0
- AC_SUBST(GPHOTO2_REQUIRED)
- GUDEV_REQUIRED=145
- AC_SUBST(GUDEV_REQUIRED)
-Index: entangle-0.5.0/src/backend/entangle-camera.c
-===================================================================
---- entangle-0.5.0.orig/src/backend/entangle-camera.c
-+++ entangle-0.5.0/src/backend/entangle-camera.c
-@@ -543,15 +543,14 @@ const char *entangle_camera_get_port(Ent
- 
- static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED,
-                                                       float target,
--                                                      const char *format,
--                                                      va_list args,
-+                                                      const char *txt,
-                                                       void *data)
- {
-     EntangleCamera *cam = data;
-     EntangleCameraPrivate *priv = cam->priv;
- 
-     if (priv->progress)
--        entangle_progress_start(priv->progress, target, format, args);
-+        entangle_progress_start(priv->progress, target, txt);
- 
-     return 0; /* XXX what is this actually useful for ? */
- }
-@@ -588,15 +587,14 @@ static void entangle_camera_reset_last_e
- }
- 
- static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED,
--                                     const char *fmt,
--                                     va_list args,
-+                                     const char *txt,
-                                      void *data)
- {
-     EntangleCamera *cam = data;
-     EntangleCameraPrivate *priv = cam->priv;
- 
-     entangle_camera_reset_last_error(cam);
--    priv->lastError = g_strdup_vprintf(fmt, args);
-+    priv->lastError = g_strdup(txt);
-     ENTANGLE_DEBUG("Got error %s", priv->lastError);
- }
- 
-Index: entangle-0.5.0/src/backend/entangle-progress.c
-===================================================================
---- entangle-0.5.0.orig/src/backend/entangle-progress.c
-+++ entangle-0.5.0/src/backend/entangle-progress.c
-@@ -23,11 +23,11 @@
- #include "entangle-debug.h"
- #include "entangle-progress.h"
- 
--void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args)
-+void entangle_progress_start(EntangleProgress *prog, float target, const char *txt)
- {
-     g_return_if_fail(ENTANGLE_IS_PROGRESS(prog));
- 
--    ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, format, args);
-+    ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, txt);
- }
- 
- void entangle_progress_update(EntangleProgress *prog, float current)
-Index: entangle-0.5.0/src/backend/entangle-progress.h
-===================================================================
---- entangle-0.5.0.orig/src/backend/entangle-progress.h
-+++ entangle-0.5.0/src/backend/entangle-progress.h
-@@ -38,14 +38,14 @@ typedef struct _EntangleProgressInterfac
- struct _EntangleProgressInterface {
-     GTypeInterface parent;
- 
--    void (*start) (EntangleProgress *prog, float target, const char *format, va_list args);
-+    void (*start) (EntangleProgress *prog, float target, const char *txt);
-     void (*update) (EntangleProgress *prog, float current);
-     void (*stop) (EntangleProgress *prog);
- };
- 
- GType entangle_progress_get_type(void);
- 
--void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args);
-+void entangle_progress_start(EntangleProgress *prog, float target, const char *txt);
- void entangle_progress_update(EntangleProgress *prog, float current);
- void entangle_progress_stop(EntangleProgress *prog);
- 
-Index: entangle-0.5.0/src/frontend/entangle-camera-manager.c
-===================================================================
---- entangle-0.5.0.orig/src/frontend/entangle-camera-manager.c
-+++ entangle-0.5.0/src/frontend/entangle-camera-manager.c
-@@ -1091,14 +1091,13 @@ static void do_camera_file_preview(Entan
- }
- 
- 
--static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *format, va_list args)
-+static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *txt)
- {
-     g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(iface));
- 
-     EntangleCameraManager *manager = ENTANGLE_CAMERA_MANAGER(iface);
-     EntangleCameraManagerPrivate *priv = manager->priv;
-     GtkWidget *mtr;
--    char *txt;
-     GtkWidget *operation;
- 
-     gdk_threads_enter();
-@@ -1107,16 +1106,12 @@ static void do_entangle_camera_progress_
-     mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress"));
-     operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation"));
- 
--    txt = g_strdup_vprintf(format, args);
--
-     gtk_widget_set_tooltip_text(mtr, txt);
-     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mtr), txt);
-     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), 0);
- 
-     gtk_widget_show(operation);
- 
--    g_free(txt);
--
-     gdk_threads_leave();
- }
-