Make colord really optional (bug #510238, thanks to Ben Kohler).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 34 insertions, 18 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index 660da2e46bca..c1113715c56c 100644
--- a/gnome-extra/cinnamon-settings-daemon/ChangeLog
+++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.1 2014/05/06 03:08:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.2 2014/05/13 14:49:46 tetromino Exp $
+
+*cinnamon-settings-daemon-2.2.2-r1 (13 May 2014)
+
+  13 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cinnamon-settings-daemon-2.2.2.ebuild,
+  +cinnamon-settings-daemon-2.2.2-r1.ebuild,
+  files/cinnamon-settings-daemon-2.2.2-optional.patch:
+  Make colord really optional (bug #510238, thanks to Ben Kohler).
 
 *cinnamon-settings-daemon-2.2.2 (06 May 2014)
 
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 77bda8a7e061..05897889ff3d 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cinnamon-settings-daemon-2.2.2-optional.patch 2760 SHA256 6578fd3f02a938b44165eea5467a5d7485ad16d7ac881a18e6eacb1e719c88e9 SHA512 d13ac3575ae0cfaad2851ad71afea16cc6fa20561fc072d41f7e3a49c33a218cdffb04e03cd77122689ba1c8e281b21068282ed415dfd1f2d1e7c86e6ffe56b9 WHIRLPOOL dc768d8a56787f9518c98907fcfdc63a6329f829db6abaa0b64a2adb4b4cdd6c936be3e64c2d6b4144f955e0a58cde673dba8eaaa7b7b7ab5ffaeb300af6e7a3
+AUX cinnamon-settings-daemon-2.2.2-optional.patch 3058 SHA256 8d87f2ca35f5fd3d14e7ad926f87252cc528c33ab78677aeb60a7f9275503c03 SHA512 8f0899c587f8fefb892901ea460760b7391acd0c651e5fb9403ec30cee189e75a3b51ebce130fb836926121872ebcdaa5257fa51b107bc8f613f0d0cea60c71e WHIRLPOOL 89ec15936315963775a755706194d2d32d5a3151f0d16fcc8103cae9f373340f8e9676bb44537097c38e9ff2566df182b826d98244b39792469596c46bcf6ad4
 DIST cinnamon-settings-daemon-2.2.2.tar.gz 2994069 SHA256 4a7f7fdb1ce7d889634bf0f5f5a3391b4209400262037dae899fb5071d3fee61 SHA512 d280a75a6cee8bf9ee4a7bee21b2a0dd62bfa5dc7b601677424405a1667b542538145071d02615b38d8ec4a4f0ded06caabe979e894a20c2fe403f3c515e717f WHIRLPOOL 8554639d3d6d4558514c146e5cc091b9ec48bddaaac69315b9c23a7339b75d376c248b1afa6ba507667f4c5b81f829b8f9f085cfb40ae2d63a1abe471b92326c
-EBUILD cinnamon-settings-daemon-2.2.2.ebuild 2146 SHA256 cbfe6824a3e06b79c49c47afed4f7970bc3f52e6b2df337d9b5bdd92829ad2bb SHA512 df701a43a2f0cd7fb5a9e639dcafdc1f9b9dcdf08d3b80469e6c6dca41ad982f47f7821fe71266d8dfae2005cc6bb7e76e9b4922738779ec81a882abbdab6a47 WHIRLPOOL b5deca63e3f86f9383ae1edc49d9d059e50e372be690bee90022a0f74905c0dbd52d079df4bd029d86c9819de3688f5cbb12f3db38865085f44122d4d90400ba
-MISC ChangeLog 504 SHA256 18400122540f8b89bf4ffd0f776e374986674ff7a4521383165db14fd53e1027 SHA512 d4b0b61dd67a7d6939420a97d8f256ec55a5ab1e33d00a819c8539f45ff637e8d9b903feaae222978031e8fb77dee10b7067fd577f0402f593aa921203fb96fc WHIRLPOOL d5c25d5097a40436beba0ffde0017859e3e1f9ca3a4de168d051d1faa460e9ec0f04c73ba890c4a9dcab650859c9e26071f64afdef9147b105d0acdd143d4524
+EBUILD cinnamon-settings-daemon-2.2.2-r1.ebuild 2149 SHA256 8f82a9e23712b433240e77e30c160d71c356dd0ffee8f7165a6230a7d6cb0add SHA512 4802e46765cb9cb2b72edb0ca10870fe0505ed775cbc6f5f7cbc5693fb917b6e004b45724c0a080f5b9c102f8d387a3ff7c446d90da95d354ed07c0ef3727938 WHIRLPOOL 536f832771a8b99b2aa530b4a04e6c3793486aa867dd6f85fe8699a62351cf8bade4673c86c544c85ed1af356b06fbd60e270c2129579c4b9bcd19fa2860ee61
+MISC ChangeLog 823 SHA256 4ffa88ccdc21e00086772d20d7840a49d94947ca6bfa6efbf3b1401d23a7cf88 SHA512 e6ee01aeea46636aba5ba4e013272c5c53cfe695915052c9cdc33c3d2efd03d6a5e9191dad8bc0355934c8c04201cf07022a4401bd8de018be00b94768977d27 WHIRLPOOL a61350ebe80df2418de6e3315208f232ce91e6758df95f749b1d2417d4c095c617d265f181351d240decb104d0c185e75fbf0b72c1209f89e4ffe26d9e23a6c1
 MISC metadata.xml 257 SHA256 8d6f87c88d3da1d9a4e3f7c1bbfe1f5b6bdc74bf2a785531d8479dc74f92f3b7 SHA512 865f4729d377504a8848dee7aee28d33d99106d097608e7d4eb01f127922b4e48f072506963532c08b432d31192c074da3b2d7cde2d9182e3018fe6125a4f580 WHIRLPOOL 6b5d874e8edc033b2b738ab962ee87aaedfa57819cb194183ccece1729b17e8a829b89319c45f9cb0390de9fc67e5cf9b1000287bafc0769a5871967cb0634d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTaFH5AAoJEJ0WA1zPCt1hqbkH/jD4VOvU77roGmmyocLgXnky
-/6Y+wErNtYRqm+K5BIonq/cGWgTn4XvszNS+fyyrJCoClPpowSNT3V6FqpL1Xavo
-YXiYur5nO5AgsrIWTc9OpMQnhvult5vXawZ2zbe5RGy7+9MX4dxhd4LhtXBjxIHI
-m6TIh9IJ6jGLYhIXVrpPxBt0GVLLXBLwFJSvNMcewsLrlpbwWGvkiIenvXwmc7nd
-2heNdff/gvhCsyX0iy7zyu61cisuwPlRExt8HQ0QCVHvqTEjR02TEUSlSQ9iFNtU
-2k7tuLRHyBjuxmIPMPd4GNtKHh7LS9dhirF3XLI7AzJ4WSixYZBM1g6RipYrMjg=
-=b1gE
+iQEcBAEBCAAGBQJTcjDUAAoJEJ0WA1zPCt1h2GIH/RANckxCdg99SNIxyDw/J3vi
+vwLfRxLO40hsvW0ghCOmTevuPvn30FEBlslFV7Q+jVg7YkH6LBBrdQYYMrzTnj8D
+g0v3G5eXJWdvSK45vB/FyUfpmyUOLU23/6Li6iwKODDENopy47TL+VpC+diM0Z/d
+SZ4MkE7kcCPLRPKXID9chdp8lbptoqj8pB6HbSONTwIxb69uaPhm00RysnMPfxuP
+w+hBBtSW2Q9NysdUPkSVrb30XwICl9oAbSLgAQ20gpgIr7a5uVn8Ug+nQlFBu+ei
+ztRpK70txVmgSaeCu8I7Rz4z/DW4P56mJWmGD7Ag/hHZAIj0T8S7w99QEBTlEz4=
+=GHrq
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
index 3e49b4a08c97..ee674418e7af 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2.ebuild,v 1.1 2014/05/06 03:08:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild,v 1.1 2014/05/13 14:49:46 tetromino Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch
index 318c9c0f68fa..9d858e6a5fa0 100644
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch
@@ -1,15 +1,15 @@
-From 2f53841e23559581ff69a7549094ab8da5fab5c9 Mon Sep 17 00:00:00 2001
+From e11e16e2842b3861c763f0d7714717ba1ba44f66 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Mon, 5 May 2014 21:50:25 -0400
 Subject: [PATCH] Make colord and wacom support optional and non-automagic
 
 ---
- configure.ac        | 19 ++++++++++++++++---
+ configure.ac        | 20 +++++++++++++++++---
  plugins/Makefile.am |  7 ++++++-
- 2 files changed, 22 insertions(+), 4 deletions(-)
+ 2 files changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 22db541..10c18a2 100644
+index 22db541..f9d50b1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -253,15 +253,28 @@ fi
@@ -18,9 +18,9 @@ index 22db541..10c18a2 100644
  dnl ---------------------------------------------------------------------------
 +AC_ARG_ENABLE(color,
 +              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_colord=yes)
++              enable_color=yes)
 +build_color=false
-+if test x"$enable_cups" != x"no" ; then
++if test x"$enable_color" != x"no" ; then
 +  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
 +  build_color=true
 +fi
@@ -44,6 +44,14 @@ index 22db541..10c18a2 100644
  
  AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
  
+@@ -595,6 +608,7 @@ echo "
+         LCMS DICT support:        ${have_new_lcms}
+         Libnotify support:        ${have_libnotify}
+ 
++        Colord support:           ${build_color}
+         Wacom support:            ${build_wacom}
+ 
+         Smartcard support:        ${have_smartcard_support}
 diff --git a/plugins/Makefile.am b/plugins/Makefile.am
 index 666bfef..2a7a4e1 100644
 --- a/plugins/Makefile.am