[gentoo-dev] [PATCH] */*: Make 'colord' a global USE flag

[gentoo-dev] [PATCH] */*: Make 'colord' a global USE flag

[Michał Górny]

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@gentoo.org>
---
 dev-libs/weston/metadata.xml                      | 1 -
 dev-util/diffoscope/metadata.xml                  | 1 -
 gnome-base/gnome-control-center/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 -
 11 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c98075bd2fed..8e5d258810a5 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 c6b5b3df2213..3899d895c5bd 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-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index f1ac0fd9a7be..05f1acb0836a 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/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="flickr">Add support for using photos from flickr as desktop background</flag>
 		<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 		<flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 3b84b19df418..cddf35764192 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>
 		<flag name="openrc-force">Skip systemd dependency (#480336),
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index dbc06458f865..64ed8e976b58 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 aab7fdc66a7f..da9442eb0216 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 228506baefbe..57ab6042d4e3 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 48b98345a820..0ba6dde6a358 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 a84032e4aaae..6c0216e15c75 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 fc19bbd0bbaa..5e4f4662750b 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -49,6 +49,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 b09a58d88e8e..12f76d9d6a2e 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>
-- 
2.22.0.rc0

Re: [gentoo-dev] [PATCH] */*: Make 'colord' a global USE flag

[James Le Cuirot]

On 18 May 2019 08:00:00 BST, "Michał Górny" <mgorny@gentoo.org> wrote:
>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@gentoo.org>
>---
> dev-libs/weston/metadata.xml                      | 1 -
> dev-util/diffoscope/metadata.xml                  | 1 -
> gnome-base/gnome-control-center/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 -
> 11 files changed, 1 insertion(+), 16 deletions(-)
>
>diff --git a/dev-libs/weston/metadata.xml
>b/dev-libs/weston/metadata.xml
>index c98075bd2fed..8e5d258810a5 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 c6b5b3df2213..3899d895c5bd 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-control-center/metadata.xml
>b/gnome-base/gnome-control-center/metadata.xml
>index f1ac0fd9a7be..05f1acb0836a 100644
>--- a/gnome-base/gnome-control-center/metadata.xml
>+++ b/gnome-base/gnome-control-center/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="flickr">Add support for using photos from flickr as
>desktop background</flag>
>		<flag name="gnome-online-accounts">Enable configuration panel for
><pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
>		<flag name="ibus">Enable support for enhanced input methods through
><pkg>app-i18n/ibus</pkg></flag>
>diff --git a/gnome-base/gnome-settings-daemon/metadata.xml
>b/gnome-base/gnome-settings-daemon/metadata.xml
>index 3b84b19df418..cddf35764192 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>
> 		<flag name="openrc-force">Skip systemd dependency (#480336),
>diff --git a/gnome-extra/cinnamon-control-center/metadata.xml
>b/gnome-extra/cinnamon-control-center/metadata.xml
>index dbc06458f865..64ed8e976b58 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 aab7fdc66a7f..da9442eb0216 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 228506baefbe..57ab6042d4e3 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 48b98345a820..0ba6dde6a358 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 a84032e4aaae..6c0216e15c75 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 fc19bbd0bbaa..5e4f4662750b 100644
>--- a/profiles/use.desc
>+++ b/profiles/use.desc
>@@ -49,6 +49,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 b09a58d88e8e..12f76d9d6a2e 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>

Okay by me.
-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH] */*: Make 'colord' a global USE flag

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

On Sat, 2019-05-18 at 09:00 +0200, Michał Górny wrote:
> 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.
> 

...and pushed.

-- 
Best regards,
Michał Górny


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 618 bytes --]