Use the correct name for Gentoo's argyll-dispcal; add a pkg_postinst message about argyllcms (bug #407319, thanks to Morse). Drop old.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 50 insertions, 3 deletions

diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog
index abe9698195dc..27689851367e 100644
--- a/gnome-extra/gnome-color-manager/ChangeLog
+++ b/gnome-extra/gnome-color-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-color-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.13 2012/02/12 17:19:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.14 2012/03/07 23:04:30 tetromino Exp $
+
+*gnome-color-manager-3.2.2-r1 (07 Mar 2012)
+
+  07 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-color-manager-3.2.1.ebuild, +gnome-color-manager-3.2.2-r1.ebuild,
+  +files/gnome-color-manager-3.2.2-argyll-prefix.patch:
+  Use the correct name for Gentoo's argyll-dispcal; add a pkg_postinst message
+  about argyllcms (bug #407319, thanks to Morse). Drop old.
 
 *gnome-color-manager-3.2.2 (12 Feb 2012)
 
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.2.2-argyll-prefix.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.2.2-argyll-prefix.patch
new file mode 100644
index 000000000000..eefc666ac181
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.2.2-argyll-prefix.patch
@@ -0,0 +1,25 @@
+From 054fb4c0eb69a9ace62053f9c1b32f2ca6fc2a5c Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 7 Mar 2012 17:51:55 -0500
+Subject: [PATCH] argyllcms executables in Gentoo are prefixed with "argyll-"
+
+---
+ src/gcm-calibrate-argyll.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
+index 3f04aa1..393537c 100644
+--- a/src/gcm-calibrate-argyll.c
++++ b/src/gcm-calibrate-argyll.c
+@@ -125,7 +125,7 @@ gcm_calibrate_argyll_get_display (const gchar *output_name, GError **error)
+ 	gchar *name;
+ 
+ 	/* execute it and capture stderr */
+-	ret = g_spawn_command_line_sync ("dispcal", NULL, &data, &exit_status, error);
++	ret = g_spawn_command_line_sync ("argyll-dispcal", NULL, &data, &exit_status, error);
+ 	if (!ret)
+ 		goto out;
+ 
+-- 
+1.7.8.5
+
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.2-r1.ebuild
index 6c6711550507..7e6544f34058 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.1.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.1.ebuild,v 1.1 2011/10/30 01:46:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.2-r1.ebuild,v 1.1 2012/03/07 23:04:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -62,3 +62,17 @@ pkg_setup() {
 		$(use_enable packagekit)
 		$(use_enable raw exiv)"
 }
+
+src_prepare() {
+	# argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319
+	epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "If you want to do display or scanner calibration, you will need to"
+	elog "install media-gfx/argyllcms"
+}