profiles: Move masks to the right place

See commit 989a661ac8ac ("profiles: Move unkeyworded dep masks to
arch/arm"). The same rationale applies.

Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 0989a3a310c46403e948dc7025f4a0c80f7bc867..24a33c84fbeb90599511a1322c1174c415bf1fda 100644 (file)
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -94,6 +94,11 @@ media-sound/pulseaudio native-headset
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
 dev-vcs/git pcre-jit
 
+# Fabian Groffen <grobian@gentoo.org> (2017-06-15)
+# net-mail/notmuch is not keyworded, and holds back stabilisation, see
+# bug https://bugs.gentoo.org/show_bug.cgi?id=604902
+mail-client/mutt notmuch
+
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
 >=sys-devel/gcc-6 ssp

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 58c3630c7a067f1d02dd81dfc4f3ccb286f54f65..d14c33e57e4f144db2373af976921452be634501 100644 (file)
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -166,6 +166,10 @@ connman
 # sys-apps/entropy is not keyworded
 entropy
 
+# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
+# Pulls in net-libs/axtls which is not keyworded for arch
+curl_ssl_axtls
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
 # media-libs/xine-lib is not keyworded
 xine

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 17909763350b4ec715af85a141e63f3f74d2e86c..f8db01005e764fe588e6229325e1d2416fad5c0d 100644 (file)
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -162,6 +162,10 @@ alsa_cards_wavefront
 # media-sound/fluidsynth isn't keyworded
 fluidsynth
 
+# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
+# Pulls in net-libs/axtls which is not keyworded for arch
+curl_ssl_axtls
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
 # net-misc/connman is not keyworded, bug 348308
 connman

diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index e3984601c31cdb0fb4f44ff4f41eb2396a079675..38cd86ebc6c6668fcaed8a43e4164d4647da2073 100644 (file)
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -58,6 +58,10 @@ app-portage/g-sorcery bson
 # dev-python/gmpy also a test depend, so minimize the features until can test properly (http2 soap test)
 dev-python/twisted conch crypt http2 soap test
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Felix Janda <felix.janda@posteo.de> (2016-09-24)
 # net-libs/libnetfilter_conntrack is not keyworded on mips
 net-dns/dnsmasq conntrack

diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 60c78c5ed7aa578b17ec87925a2dce5aa0c2b253..036de06eeaf0a273829b0c06d9498117d14a7ac8 100644 (file)
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -129,6 +129,10 @@ sci-geosciences/gpsbabel gui
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Thomas Deutschmann <whissi@gentoo.org> (2016-08-26)
 # Enable numa support on supported architectures
 dev-db/mysql -numa

diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index cb45c2c6f171618a7577ea0c5f45662121a164d4..3909985198b10c1860975e38d1af0a47673ce663 100644 (file)
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -115,6 +115,10 @@ dev-libs/hiredis test
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Michał Górny <mgorny@gentoo.org> (2016-11-18)
 # libomp does not support SPARC, #600148.
 sys-devel/clang-runtime openmp
@@ -315,6 +319,11 @@ x11-misc/xscreensaver new-login
 # libhid is not keyworded
 app-misc/lcdproc hid lcd_devices_mdm166a
 
+# Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
+# Mask the vde flag on tinc because net-misc/vde is not
+# keyworded for sparc
+net-vpn/tinc vde
+
 # Alexey Shvetsov <alexxy@gentoo.org> (2011-12-17)
 # Mask use numa for openmpi
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover

diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index b24b2fe93808601e157cbfc0109677c899326c44..9d4081792d4b036ffe0b8323df19ebfa856818c8 100644 (file)
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -8,6 +8,10 @@
 # Temporary mask for stable bug 688976
 ruby_targets_ruby25
 
+# Ben Kohler <bkohler@gentoo.org> (2019-06-11)
+# Pulls in net-libs/axtls which is not stable for sparc
+curl_ssl_axtls
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-02-02)
 # No stable app-arch/rpm on sparc.
 rpm

diff --git a/profiles/default/linux/alpha/17.0/use.mask b/profiles/default/linux/alpha/17.0/use.mask
deleted file mode 100644 (file)
index 50a187c..0000000
--- a/profiles/default/linux/alpha/17.0/use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls

diff --git a/profiles/default/linux/alpha/17.0/use.stable.mask b/profiles/default/linux/alpha/17.0/use.stable.mask
deleted file mode 100644 (file)
index f54e7a1..0000000
--- a/profiles/default/linux/alpha/17.0/use.stable.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-

diff --git a/profiles/default/linux/alpha/package.use.mask b/profiles/default/linux/alpha/package.use.mask
deleted file mode 100644 (file)
index 2b02505..0000000
--- a/profiles/default/linux/alpha/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-06-15)
-# net-mail/notmuch is not keyworded, and holds back stabilisation, see
-# bug https://bugs.gentoo.org/show_bug.cgi?id=604902
-mail-client/mutt notmuch

diff --git a/profiles/default/linux/ia64/17.0/use.mask b/profiles/default/linux/ia64/17.0/use.mask
deleted file mode 100644 (file)
index 4401550..0000000
--- a/profiles/default/linux/ia64/17.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls

diff --git a/profiles/default/linux/ia64/17.0/use.stable.mask b/profiles/default/linux/ia64/17.0/use.stable.mask
deleted file mode 100644 (file)
index 90062e0..0000000
--- a/profiles/default/linux/ia64/17.0/use.stable.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2

diff --git a/profiles/default/linux/m68k/17.0/package.mask b/profiles/default/linux/m68k/17.0/package.mask
deleted file mode 100644 (file)
index 1753272..0000000
--- a/profiles/default/linux/m68k/17.0/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2

diff --git a/profiles/default/linux/mips/package.use.mask b/profiles/default/linux/mips/package.use.mask
deleted file mode 100644 (file)
index c3bd17b..0000000
--- a/profiles/default/linux/mips/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch

diff --git a/profiles/default/linux/powerpc/package.use.mask b/profiles/default/linux/powerpc/package.use.mask
index 6a1e090315a634bdf387791de491da880f73d19b..fdb8bc6a65712065c682b4c3780126c404d1389f 100644 (file)
--- a/profiles/default/linux/powerpc/package.use.mask
+++ b/profiles/default/linux/powerpc/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch
-
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize

diff --git a/profiles/default/linux/sparc/17.0/package.use.mask b/profiles/default/linux/sparc/17.0/package.use.mask
deleted file mode 100644 (file)
index 2ede420..0000000
--- a/profiles/default/linux/sparc/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
-#
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for sparc
-net-vpn/tinc vde

diff --git a/profiles/default/linux/sparc/17.0/use.stable.mask b/profiles/default/linux/sparc/17.0/use.stable.mask
deleted file mode 100644 (file)
index f24ba8c..0000000
--- a/profiles/default/linux/sparc/17.0/use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ben Kohler <bkohler@gentoo.org> (2019-06-11)
-# Pulls in net-libs/axtls which is not stable for sparc
-curl_ssl_axtls

diff --git a/profiles/default/linux/sparc/package.use.mask b/profiles/default/linux/sparc/package.use.mask
index 6a1e090315a634bdf387791de491da880f73d19b..fdb8bc6a65712065c682b4c3780126c404d1389f 100644 (file)
--- a/profiles/default/linux/sparc/package.use.mask
+++ b/profiles/default/linux/sparc/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch
-
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize