Version bump and fix bash completion paths (bug #497790, thanks to poncho). Fix build failure with colord-1.2.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 122 insertions, 4 deletions

diff --git a/media-gfx/colorhug-client/ChangeLog b/media-gfx/colorhug-client/ChangeLog
index 78447be0c1d0..19c5afb64650 100644
--- a/media-gfx/colorhug-client/ChangeLog
+++ b/media-gfx/colorhug-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/colorhug-client
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/ChangeLog,v 1.14 2014/04/27 07:25:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/ChangeLog,v 1.15 2014/04/27 21:42:17 tetromino Exp $
+
+*colorhug-client-0.2.1 (27 Apr 2014)
+
+  27 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  colorhug-client-0.2.0.ebuild, +colorhug-client-0.2.1.ebuild,
+  +files/colorhug-client-0.2.1-colord-1.2.patch:
+  Version bump and fix bash completion paths (bug #497790, thanks to poncho).
+  Fix build failure with colord-1.2.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -colorhug-client-0.1.12.ebuild:
   drop old
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild
index 465910917997..bd3b092af555 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild,v 1.4 2013/12/08 19:04:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.0.ebuild,v 1.5 2014/04/27 21:42:17 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libcanberra[gtk3]
 	net-libs/libsoup:2.4
 	x11-libs/gtk+:3
-	>=x11-misc/colord-0.1.31
+	>=x11-misc/colord-0.1.31:0=
 	>=x11-libs/colord-gtk-0.1.24
 "
 DEPEND="${RDEPEND}
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild
new file mode 100644
index 000000000000..6541ac7f0fa4
--- /dev/null
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild,v 1.1 2014/04/27 21:42:17 tetromino Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Client tools for the ColorHug display colorimeter"
+HOMEPAGE="http://www.hughski.com/"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.31.10:2
+	dev-libs/libgusb
+	media-libs/lcms:2
+	media-libs/libcanberra[gtk3]
+	net-libs/libsoup:2.4
+	x11-libs/gtk+:3
+	>=x11-misc/colord-0.1.31:0=
+	>=x11-libs/colord-gtk-0.1.24
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# docbook stuff needed for man pages
+
+src_prepare() {
+	# from 0.2.2 - fixes build with colord-1.2
+	epatch "${FILESDIR}/${P}-colord-1.2.patch"
+	gnome2_src_prepare
+
+	# Fix completiondir, avoid eautoreconf
+	sed -i "s|^bashcompletiondir =.*|bashcompletiondir = $(get_bashcompdir)|" \
+		data/Makefile.in || die "sed bashcompletiondir failed"
+}
+
+src_configure() {
+	# introspection checked but not needed by anything
+	gnome2_src_configure --disable-introspection
+}
diff --git a/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch b/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch
new file mode 100644
index 000000000000..66612baad81b
--- /dev/null
+++ b/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch
@@ -0,0 +1,57 @@
+diff --git a/src/ch-ccmx.c b/src/ch-ccmx.c
+index d674b16..e33e6d6 100644
+--- a/src/ch-ccmx.c
++++ b/src/ch-ccmx.c
+@@ -510,9 +510,15 @@ ch_ccmx_get_device_download_kind (ChCcmxPrivate *priv)
+ 	case CH_DEVICE_MODE_FIRMWARE:
+ 		str = "colorhug";
+ 		break;
++#if CD_CHECK_VERSION(1,2,0)
++	case CH_DEVICE_MODE_BOOTLOADER_PLUS:
++	case CH_DEVICE_MODE_FIRMWARE_PLUS:
++		str = "colorhug-plus";
++#else
+ 	case CH_DEVICE_MODE_BOOTLOADER_SPECTRO:
+ 	case CH_DEVICE_MODE_FIRMWARE_SPECTRO:
+ 		str = "colorhug-spectro";
++#endif
+ 		break;
+ 	default:
+ 		str = "unknown";
+diff --git a/src/ch-flash.c b/src/ch-flash.c
+index 53ef123..82b2c03 100644
+--- a/src/ch-flash.c
++++ b/src/ch-flash.c
+@@ -721,9 +721,15 @@ ch_flash_get_device_download_kind (ChFlashPrivate *priv)
+ 	case CH_DEVICE_MODE_FIRMWARE:
+ 		str = "colorhug";
+ 		break;
++#if CD_CHECK_VERSION(1,2,0)
++	case CH_DEVICE_MODE_BOOTLOADER_PLUS:
++	case CH_DEVICE_MODE_FIRMWARE_PLUS:
++		str = "colorhug-plus";
++#else
+ 	case CH_DEVICE_MODE_BOOTLOADER_SPECTRO:
+ 	case CH_DEVICE_MODE_FIRMWARE_SPECTRO:
+ 		str = "colorhug-spectro";
++#endif
+ 		break;
+ 	default:
+ 		str = "unknown";
+diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c
+index 7f5c989..f03ed5c 100644
+--- a/src/ch-spectro-util.c
++++ b/src/ch-spectro-util.c
+@@ -476,7 +476,12 @@ ch_util_device_added_cb (GUsbDeviceList *list,
+ 	g_debug ("Added: %i:%i",
+ 		 g_usb_device_get_vid (device),
+ 		 g_usb_device_get_pid (device));
++
++#if CD_CHECK_VERSION(1,2,0)
++	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_PLUS) {
++#else
+ 	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) {
++#endif
+ 		priv->device = g_object_ref (device);
+ 		ch_util_got_device (priv);
+ 	}