commit:     5fa8e48b2dbe75973685d3e25538fa777135bcad
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 17:47:29 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 17:47:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa8e48b

profiles: adjust thunderbird use.mask of app-misc/tracker

Previously the thunderbird USE flag was package.use.mask'ed
on app-misc/tracker on various arches or subprofiles.  This
commit changes things around so that it is p.u.masked in base
and the p.u.mask removed in x86 and amd64 arch profiles instead,
matching the pattern of USE=firefox-bookmarks

Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>

 profiles/arch/amd64/package.use.mask                      | 5 +++--
 profiles/arch/arm64/package.use.mask                      | 4 ----
 profiles/arch/ia64/package.use.mask                       | 4 ----
 profiles/arch/x86/package.use.mask                        | 5 +++--
 profiles/base/package.use.mask                            | 5 +++--
 profiles/default/linux/alpha/13.0/package.use.stable.mask | 6 ------
 profiles/default/linux/alpha/17.0/package.use.stable.mask | 6 ------
 7 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index e81b99e2eb2..82836742587 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -22,8 +22,9 @@
 media-libs/libsdl2 -vulkan
 
 # Thomas Deutschmann <[email protected]> (12 Oct 2018)
-# www-client/firefox is available on amd64
-app-misc/tracker -firefox-bookmarks
+# www-client/firefox and mail-client/thunderbird are
+# available on amd64
+app-misc/tracker -firefox-bookmarks -thunderbird
 
 # Michael Palimaka <[email protected]> (12 Oct 2018)
 # Unmask arch-specific USE flags available on amd64

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 3255e280d63..879b7bae959 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -205,10 +205,6 @@ dev-libs/dbus-c++ ecore
 # USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
 app-office/libreoffice eds postgres
 
-# Michał Górny <[email protected]> (23 Jan 2018)
-# Requires mail-client/thunderbird* that is not keyworded here.
-app-misc/tracker thunderbird
-
 # Michał Górny <[email protected]> (23 Jan 2018)
 # Requires app-accessibility/brltty that is not keyworded here.
 app-emulation/qemu accessibility

diff --git a/profiles/arch/ia64/package.use.mask 
b/profiles/arch/ia64/package.use.mask
index ff147fbde48..ded5464d0dc 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -284,10 +284,6 @@ net-misc/modemmanager qmi
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <[email protected]> (31 Dec 2012)
-# remove mask if/when mail-client/thunderbird is keyworded here
-app-misc/tracker thunderbird
-
 # Alexandre Rostovtsev <[email protected]> (31 Dec 2012)
 # requires app-office/unoconv, which requires virtual/ooo, which is not
 # keyworded here. Remove mask if this situation changes.

diff --git a/profiles/arch/x86/package.use.mask 
b/profiles/arch/x86/package.use.mask
index 7d3e5652015..39a47a933e9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -8,8 +8,9 @@
 net-analyzer/zmap mongo
 
 # Thomas Deutschmann <[email protected]> (12 Oct 2018)
-# www-client/firefox is available on x86
-app-misc/tracker -firefox-bookmarks
+# www-client/firefox and mail-client/thunderbird is
+# available on x86
+app-misc/tracker -firefox-bookmarks -thunderbird
 
 # Michael Palimaka <[email protected]> (12 Oct 2018)
 # Unmask arch-specific USE flag available on x86

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d22c53ba440..f87df0997a8 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -51,9 +51,10 @@ sys-power/suspend fbsplash
 media-libs/mesa openmax
 
 # Thomas Deutschmann <[email protected]> (12 Oct 2018)
-# Requires www-client/firefox which isn't available on all architectures
+# Requires www-client/firefox and mail-client/thunderbird
+# which are not available on all architectures
 # yet, unmask per arch
-app-misc/tracker firefox-bookmarks
+app-misc/tracker firefox-bookmarks thunderbird
 
 # Chí-Thanh Christopher Nguyễn <[email protected]> (06 Oct 2018)
 # address user visible breakage due to circular dependency #665008

diff --git a/profiles/default/linux/alpha/13.0/package.use.stable.mask 
b/profiles/default/linux/alpha/13.0/package.use.stable.mask
deleted file mode 100644
index 0b72dc99627..00000000000
--- a/profiles/default/linux/alpha/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Pacho Ramos <[email protected]> (27 Jan 2014)
-# Mask until we are able to stabilize thunderbird, bug #488766
-app-misc/tracker thunderbird

diff --git a/profiles/default/linux/alpha/17.0/package.use.stable.mask 
b/profiles/default/linux/alpha/17.0/package.use.stable.mask
deleted file mode 100644
index 0b72dc99627..00000000000
--- a/profiles/default/linux/alpha/17.0/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Pacho Ramos <[email protected]> (27 Jan 2014)
-# Mask until we are able to stabilize thunderbird, bug #488766
-app-misc/tracker thunderbird

Reply via email to