Version bump; add a (conditional, unfortunately) patch to support libgphoto-2.5.0 instead of crashing.

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 199 insertions, 10 deletions

diff --git a/media-gfx/entangle/ChangeLog b/media-gfx/entangle/ChangeLog
index a5420371b38d..e46c7837c1de 100644
--- a/media-gfx/entangle/ChangeLog
+++ b/media-gfx/entangle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/entangle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.5 2012/12/31 02:50:01 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.6 2013/01/20 13:15:22 flameeyes Exp $
+
+*entangle-0.5.0 (20 Jan 2013)
+
+  20 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> +entangle-0.5.0.ebuild,
+  +files/entangle-0.5.0+libgphoto2-2.5.0.patch:
+  Version bump; add a (conditional, unfortunately) patch to support
+  libgphoto-2.5.0 instead of crashing.
 
 *entangle-0.4.1 (31 Dec 2012)
 
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 01cca824a37c..ba7d39b038f3 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX entangle-0.5.0+libgphoto2-2.5.0.patch 5213 SHA256 aa18cc0d5b4330a5fb60c856181fe980f18277249aa78be9b7d052563e3fa67e SHA512 492eb26dbbeafd8eea201781306c280ca8e30bcdd692cc79c5469a8e4395a4cd8be571310b63d9d4ccdaff03524bac6bbf0dea44caabea0adf2b54b8c1efad86 WHIRLPOOL d71ca4b41145f36f9137a6d2f119981da8ec5f2df3aa5242725f57089f7bba3c670d5611b90c0ad129fca8cf1af5266717503a54e85b913a6a81b05a8e23d02e
 DIST entangle-0.4.0.tar.gz 778923 SHA256 9a2f8017caff738cca901f9a784d83160cd706461c51268cdc03329eb00159f2 SHA512 8f5470945a14fc5b1a9c8f5b61717f6e1763243478c97bbcfec2119fe3cea1c6dbc49d403269c02ae25ef19f67d5784fa283fddf6680a3fc0b1556b0f1b4f788 WHIRLPOOL 3c9254952a26a71beac088e0351a0eb36d71079385bfea3ea000aff05c37df1302cfbf8f75df5011593102230cb0a5333de44099a17b890bbd2ae8d3fa30b795
 DIST entangle-0.4.1.tar.gz 794960 SHA256 045f2fb2c5cc69508e935a3039b7383eb3665042a941a2894ae85ef38477f0fa SHA512 ff02dda2de603589bafd642171f6963d942b0ce0e951c660f99c55333bb35d48d192302366c7388a4de4eec656cf91dbffe87ca38e49aac7ee8a90e3e9a4095b WHIRLPOOL 8322511c88f84c140fa2f71e1adbca5afd6d532973dc99023973f6dfbea2c188f274be45abe122f2e7ce12325522c9ea4e266ab5b4ac9826f2483312eb04acc9
+DIST entangle-0.5.0.tar.gz 878144 SHA256 f6e80602c569e197482ee3099a0e4e2eb35f26d913dd11b3fc3b4eb37526d4c3 SHA512 9481fb49f4dac482103a4a1f89ee642ebac3a41f57d031f393244c6a38bafcacdc79203bde9c443b1a653cda5d77efee35428c5fcc8dc00e8e10b68fe940618b WHIRLPOOL e10f3ef242be7143173f20a9dc977534ffbd7935e3dfbda2c06c39b29b89bb1d752897dd0ad41d913c5e93771ad4b9d1ef44a1388ce151a506e187f19832eb23
 EBUILD entangle-0.4.0.ebuild 1007 SHA256 955406938a79bbac1d4b9673310d89c52c7c08b75b5ce33831f4076951861a22 SHA512 2cf166898e913cf8d57ae919f19c6894f887157d2fa763f7df583b12de9e0cdfdb0b934f6578b6e5bceef5f2cdcec98cd61511933166971bdd78f5b1700ed827 WHIRLPOOL 27bf44e3c670f07404f951cea1d4f67a55f3ccab60da5bb019e2604f0467d156296b32bbb9bae7515bd8a606ca7197137231004a427972165162a2fc6e7723f4
 EBUILD entangle-0.4.1.ebuild 1056 SHA256 d48934393ab5739c7747a6d3e441858877e219f1649d9f1d82c915b32963e258 SHA512 929a6f5f329e3b85961d8c09d73de8ce52208128505f7a14fb4a2cb4be9e44dc151648bd2f9ad63da1114c053bac03971b892109b75cc0be82932dfb3599aa79 WHIRLPOOL d363739fdca08ab92c9549688c4b28e17aa45b5e13040a0d985d86a65dc66147f7458a22c137acb917b5c421496770b8c32ef52e77554c393dc71fa27d97f956
-MISC ChangeLog 1085 SHA256 2a16feab4ce9aafc43bbb456532a796ea35727737bad95ba07090cba371ea932 SHA512 e7e432fac0892efe33eb6c48eeb5de41df1625f889401b3c220d7dcfea19b0aada6bf23228daf1627a54f2e1a5f51f14aa8f8d5a89bff70def6ab9942b57a6bf WHIRLPOOL e588829646ad1e3ba782a089c0f6cec96f47e38d84bc71a98f21ea7447c653d057a930788c3da1b96d0b7b39759020ccd2fea9368a00c56d0092eda4f6eeebb6
+EBUILD entangle-0.5.0.ebuild 1231 SHA256 85f42e9aed833d2e234be7239ccaa644bcad0e3dc3a5d9c5776b590dd9e3cb39 SHA512 0ad2cc35ee0ad3196f588d5d44f0c67be6acdb690b70613b57542331cf9b0d26ded442aa2637c0007ef2c54e6f204ee05dcdbf13fee60b9b7052dbf449eee7fc WHIRLPOOL 878d65a5a762c0651e4045dc485d70f4498b52ed8d8bbc054ca6012a1930b8e0e93a949554cd9908b440747fa2bc87ad264d2802d1cca16754796ddbef703e5a
+MISC ChangeLog 1352 SHA256 3fd864f7bff64bd94919389730d76103274ead44659b765f7dbed986d1e344f1 SHA512 016265e73a3a45412cce9b2fdc2f5220904012afc0b507f5097b43bdfbe441ab34356014d4df7072391da213fb5369e3724876928506c3e2fe8e1be69fc10901 WHIRLPOOL 1a691d1bdcc5325ea97b0594177e3305623b5b16c297551d0cf0f347ff980363155198e6f6bdefa47cc249ebbd9719c88d1d39200e4765f0a671574629ec7572
 MISC metadata.xml 300 SHA256 6d49bc72f56d736a9246f24c1399669181a1a341d62abab12ac7bad56c234878 SHA512 d6996d0b9e04f69dec39779fd1ceca7803c57e61d746dc61c59b201bf57b3304518df0546663c6a1425606cb153f37377e86dbb867685cf8733d60aadbe7a0fb WHIRLPOOL 263c159a5ae9d24bec54bae2c9fb641d8ae3ad01fef01a9b6d87f5722f101bc595c7c14335d2812731e5daa6442a09c5f9a996de78966b4f055ea8e232307769
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ4P1XAAoJEBzRPIrUMBNCHHcIAIxElxedu44OsKBn5N5GE3v6
-DdAt6gYg1U2IKYGBFdL/ji7zRwrGNXCqbEA0Tt3jBZU9jojC+3DDQlQmlvgD8TP+
-dpF3+XlSkGQF9quSa44HtJw9LQ6nZq59TqWDq2nMcIPUaXxn2HvtHn78FXFVYJOQ
-Km5iyVHTz4plWFHQp7sgP2un5hMusxwYoZciN8f5zjYHZzWVCskeLYAYPCsloHza
-NOa9QRH01Gv7Mv4tAxL3U5q1Tq3TwH6AoGyw0V2fWVj5GkQBvxeGsiEVJClYtbAo
-I/AAuNvbF7rC0BDzh0qhV+epfcLprGqy4qnN6ctK9RIX/kd57AqBGy3vQA0gpj0=
-=7BEo
+iQEcBAEBCAAGBQJQ++4RAAoJEBzRPIrUMBNCAsMH/1o8nzk7NYtAS60daGUu4zNR
+6nV3WYWwxOPbM8FCrHA9wj0SFsowMANfN5d1DoA6lZQM26GsU+Au3bKsCajgEc+Y
+zsXdg1v+AajSfmHGBQiIkMPfvOMpLwEiAlWodJRv9q6ffXYRpAGqNdzFQQiYNusD
+mNYbGUGeujH/cfD8Eu+v9a/sEyidvvT+l8uZFndLmGGFTwxDRuC8K7z30jhbU0jk
+y5nNvtsw1dHg3zVBtZ70NxGS3RGNfWQ9eEHbJ6JujE7rZF3X9NkO/MLosWj9nCOU
+6kXVFcxgXgsroHL/KeHbAM78Ej99vInqChb15u5Hgwu5irFaU1WbQMq4OCiUpik=
+=L35d
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/entangle/entangle-0.5.0.ebuild b/media-gfx/entangle/entangle-0.5.0.ebuild
new file mode 100644
index 000000000000..9c4bf3cfa697
--- /dev/null
+++ b/media-gfx/entangle/entangle-0.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/entangle-0.5.0.ebuild,v 1.1 2013/01/20 13:15:22 flameeyes Exp $
+
+EAPI=4
+
+inherit gnome2 eutils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="http://entangle-photo.org/"
+SRC_URI="http://entangle-photo.org/download/sources/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	x11-libs/gtk+:3
+	>=sys-fs/udev-145[gudev]
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/gobject-introspection-0.9.3
+	>=media-libs/libgphoto2-2.4.11
+	>=media-libs/lcms-1.18
+	>=dev-libs/libpeas-0.5.5[gtk]
+	>=media-libs/gexiv2-0.2.2
+	>=x11-libs/libXext-1.3.0
+	>=media-libs/libraw-0.9.0"
+RDEPEND="${DEPEND}"
+DEPEND+="
+	virtual/pkgconfig"
+
+G2CONF+="
+	--disable-maintainer-mode
+	--disable-dependency-tracking
+	--docdir=/usr/share/doc/${PF}
+	--htmldir=/usr/share/doc/${PF}/html
+	--disable-werror
+	--disable-static
+	--disable-silent-rules"
+
+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
new file mode 100644
index 000000000000..83013be446c4
--- /dev/null
+++ b/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch
@@ -0,0 +1,129 @@
+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();
+ }
+