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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 57 insertions, 10 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/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 1305da97ac45..1781b85fb032 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-color-manager-2.32.0-libnotify-0.7.patch 732 RMD160 9cfd74dc9f784429d674578c4a02a0bc61f47562 SHA1 1635dfa32b90575da915da896618f0fb90718c15 SHA256 a4ac10d8bda2fb8e9d7580524d086b87cede2b8188f2cace17032f735b7773dd
+AUX gnome-color-manager-3.2.2-argyll-prefix.patch 854 RMD160 012d4df8b27c962b053f2826be51c15c2b93a8e3 SHA1 5c7befde84168bd629be58340d9fbd5df7faaa03 SHA256 8fe173482ffb9927995fa19801e841e79257dc9ddbda1455df4db321bc456a87
 DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf
-DIST gnome-color-manager-3.2.1.tar.xz 2512124 RMD160 1967a51edd0f19083a33beddb5a0d04be8dc448d SHA1 599615b18b4396419f82d726e1e820c9ee3a98bd SHA256 bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436
 DIST gnome-color-manager-3.2.2.tar.xz 2515672 RMD160 07144f69ab7e08f27775bdd27333bd972556ab43 SHA1 171cc28610b18b3dcf403865814236d263f06b05 SHA256 4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a
 EBUILD gnome-color-manager-2.32.0.ebuild 1292 RMD160 b818cda3c49644419bd8c6f7747cfe646321df60 SHA1 da56e3ace8686faeac19cc239c1ca6a5544f6834 SHA256 e7d977ba95713ec0a043bcfc68b520068c3038a7cac9719dea2d9918cbbcfe08
-EBUILD gnome-color-manager-3.2.1.ebuild 1553 RMD160 64631543457e718228c51b70e33813906ac92fba SHA1 0a15f8991464b06255f9e180da6192249f342375 SHA256 23aea3f955b244bae6b95279732681f74eae89d9399fb9383ecb834949d8ba62
+EBUILD gnome-color-manager-3.2.2-r1.ebuild 1879 RMD160 72e5c3d33344f29474d54b7f771d64a1ef5e6133 SHA1 ddd86b9b287f65e6739b0ada030fa1ebbe358fad SHA256 e4c790e45ae377ba47fe2095cf5f1120580a57fbda67caa9d1c139790684cee2
 EBUILD gnome-color-manager-3.2.2.ebuild 1547 RMD160 289ef050af73e5e22bc37300d65173907810f03b SHA1 871b54cba5ed06b09f691074978d80189b242c3f SHA256 786b754bda428e7c6718f4946dd0156609c6ed112c69abe8e66964456d51bfe0
-MISC ChangeLog 2704 RMD160 234db1b019b30361f56c68e5ada5923bf389a257 SHA1 441104957952a93a4c365540a4981809e46bad91 SHA256 20069992a524c1f7907653e1dba841ff6ea397d7f278bdf7b2122054f7b0b9fe
+MISC ChangeLog 3085 RMD160 ed61a3d98ad33a79c68540e57f7b5d1ec6c57fe2 SHA1 ea1d7c9b4740b3b043db932dc1b0ff3addb5f9a4 SHA256 72f4a06c5c50af532efa6af31c67c1e7d1686606b20e64796d2b78c7b5da0352
 MISC metadata.xml 513 RMD160 b2c842ce4de899e7f1355e10febb7bd89bea69e5 SHA1 cf78374e23a7c67c42f7aae9af9e290d91377800 SHA256 1fa9edf8be6f927f45a6248c095e5697be128cc01aa274c02782b33953354495
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk839IwACgkQ1fmVwcYIWAY36ACaAyfD9nj0omt/JqG8lzxfv5nl
-GkcAnR9Mn5eUwO0ScltmILH0CDpPphlk
-=ZMjr
+iF4EAREIAAYFAk9X6YQACgkQdjK8w9WeBnBorAD/YUsDrRuZ0UVEIK9xDxYPuzzW
+aPK1Z6525jiPmidJcG0A/jpX8atTMmAbPKrLXgXhBtKpL+nKw3+49tpE9B6R3U09
+=jMgn
 -----END PGP SIGNATURE-----
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"
+}