Version bump, drop old

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

4 files changed, 18 insertions, 121 deletions

diff --git a/media-gfx/colorhug-client/ChangeLog b/media-gfx/colorhug-client/ChangeLog
index 16016744ee7b..383d41ea7603 100644
--- a/media-gfx/colorhug-client/ChangeLog
+++ b/media-gfx/colorhug-client/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2014/12/19 13:39:32 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/ChangeLog,v 1.23 2015/01/25 15:49:03 pacho Exp $
+
+*colorhug-client-0.2.5 (25 Jan 2015)
+
+  25 Jan 2015; Pacho Ramos <pacho@gentoo.org> +colorhug-client-0.2.5.ebuild,
+  -colorhug-client-0.2.1.ebuild, -colorhug-client-0.2.2.ebuild,
+  -files/colorhug-client-0.2.1-colord-1.2.patch:
+  Version bump, drop old
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> colorhug-client-0.2.3.ebuild:
   amd64 stable, bug 529964
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild
deleted file mode 100644
index 821cd582af0b..000000000000
--- a/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.3 2014/07/23 15:18:47 ago 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/colorhug-client-0.2.2.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild
index f7c82adb741f..994c1d871abe 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.2.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.5.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/colorhug-client/colorhug-client-0.2.2.ebuild,v 1.1 2014/11/02 13:37:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild,v 1.1 2015/01/25 15:49:03 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -19,12 +19,12 @@ IUSE=""
 RDEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.31.10:2
-	dev-libs/libgusb
+	>=dev-libs/libgusb-0.2.2
 	media-libs/lcms:2
-	media-libs/libcanberra[gtk3]
+	>=media-libs/libcanberra-0.10[gtk3]
 	net-libs/libsoup:2.4
 	>=x11-libs/gtk+-3.11.2:3
-	>=x11-misc/colord-1.2.3:0=
+	>=x11-misc/colord-1.2.6:0=
 	>=x11-libs/colord-gtk-0.1.24
 "
 DEPEND="${RDEPEND}
@@ -42,13 +42,13 @@ src_prepare() {
 	sed -e '/Terminal=/ d' -i data/colorhug-docs.desktop || die
 
 	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
 }
+
+src_install() {
+	gnome2_src_install bashcompletiondir="$(get_bashcompdir)"
+}
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
deleted file mode 100644
index 66612baad81b..000000000000
--- a/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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);
- 	}