[gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/, media-gfx/darktable/, gnome-extra/cinnamon-control-center/, ...

[gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/, media-gfx/darktable/, gnome-extra/cinnamon-control-center/, ...

[Michał Górny]

commit:     46406ba46f279ed059fa52ad7b12ff701a1cc514
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 06:55:49 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 20:39:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46406ba4

*/*: Make 'colord' a global USE flag

USE=colord is used in 11 packages consistently.  Make it a global USE
flag using the description from GNOME packages, and remove redundant
local definitions.

The local definition in x11-libs/gtk+ is left as it clarifies that
the flag applies to printing.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/weston/metadata.xml                      | 1 -
 dev-util/diffoscope/metadata.xml                  | 1 -
 gnome-base/gnome-settings-daemon/metadata.xml     | 1 -
 gnome-extra/cinnamon-control-center/metadata.xml  | 3 ---
 gnome-extra/cinnamon-settings-daemon/metadata.xml | 3 ---
 media-gfx/darktable/metadata.xml                  | 1 -
 media-gfx/gthumb/metadata.xml                     | 1 -
 media-gfx/simple-scan/metadata.xml                | 3 ---
 profiles/use.desc                                 | 1 +
 xfce-base/xfce4-settings/metadata.xml             | 1 -
 10 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 58d4ccfd3a4..c5e4b9c6889 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -6,7 +6,6 @@
 	<name>James Le Cuirot</name>
 </maintainer>
 <use>
-	<flag name="colord">Allow setting color managment</flag>
 	<flag name="desktop">Enable the desktop shell</flag>
 	<flag name="drm">Enable drm compositor support</flag>
 	<flag name="editor">Install wayland-editor example application</flag>

diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index c6b5b3df221..3899d895c5b 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -13,7 +13,6 @@
 </longdescription>
 <use>
   <flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
-  <flag name="colord">Use <pkg>x11-misc/colord</pkg></flag>
   <flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
   <flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
   <flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 5e2d0958ba4..b5c44662153 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
 		<flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
 	</use>

diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index dbc06458f86..64ed8e976b5 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</name>
 	</maintainer>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
 	</upstream>

diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index aab7fdc66a7..da9442eb021 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</name>
 	</maintainer>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
 	</upstream>

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 228506baefb..57ab6042d4e 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>

diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 48b98345a82..0ba6dde6a35 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management</flag>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>

diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index a84032e4aaa..6c0216e15c7 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -11,9 +11,6 @@
 		You can print your scans, export them to pdf, or save them in a range
 		of image formats.
 	</longdescription>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="launchpad">simple-scan</remote-id>
 	</upstream>

diff --git a/profiles/use.desc b/profiles/use.desc
index bcb15311a1e..92b90f4b2df 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -48,6 +48,7 @@ cdr - Add support for CD writer hardware
 cgi - Add CGI script support
 cjk - Add support for Multi-byte character languages (Chinese, Japanese, Korean)
 clamav - Add support for Clam AntiVirus software (usually with a plugin)
+colord - Support color management using x11-misc/colord
 connman - Add support for net-misc/connman
 coreaudio - Build the CoreAudio driver on Mac OS X systems
 cracklib - Support for cracklib strong password checking

diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
index b09a58d88e8..12f76d9d6a2 100644
--- a/xfce-base/xfce4-settings/metadata.xml
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -6,7 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
     <flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
     <flag name="xklavier">Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
   </use>