profiles: consolidate iwd USE masks

Now that net-wireless/iwd is keyworded everywhere we need it, we only
need to stable-mask the flag.

Signed-off-by: Ben Kohler <bkohler@gentoo.org>

6 files changed, 4 insertions, 20 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 902e02eb945b..301ed55a9fc0 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -83,10 +83,6 @@ net-analyzer/testssl -bundled-openssl -kerberos
 # Unmask libheif support where media-libs/libheif is keyworded
 media-gfx/imagemagick -heif
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/networkmanager -iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
 # Dependency sys-cluster/ceph is keyworded for amd64
 net-fs/samba -ceph
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index c92316952397..ae366e0960f3 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -47,10 +47,6 @@ media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfe
 # unmask sssd for sudo
 app-admin/sudo -sssd
 
-# Mart Raudsepp <leio@gentoo.org> (2018-11-01)
-# net-wireless/iwd not stable yet
-net-misc/networkmanager iwd
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-09-15)
 # the dependency is unstable
 media-video/libav nvidia
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 83885078994d..884bf63c8e93 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -62,10 +62,6 @@ net-analyzer/testssl bundled-openssl kerberos
 # Requires media-libs/libheif which is only keyworded for amd64 and x86
 media-gfx/imagemagick heif
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Mask iwd support until net-wireless/iwd is keyworded
-net-misc/networkmanager iwd
-
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
 # Catalyst only has support for assembling bootloader on some arches
 dev-util/catalyst system-bootloader
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 6c08ce2d854a..a5ca48737256 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -76,10 +76,6 @@ dev-python/pymongo test
 # media-libs/qtav not keyworded
 media-video/orion qtav
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/networkmanager -iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
 # Dependency sys-cluster/ceph is keyworded for x86
 net-fs/samba -ceph
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 613458e8f88e..e9d4f7ae84d0 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -42,10 +42,6 @@ media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfe
 # unmask sssd for sudo
 app-admin/sudo -sssd
 
-# Mart Raudsepp <leio@gentoo.org> (2018-11-01)
-# net-wireless/iwd not stable yet
-net-misc/networkmanager iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-09-27)
 # sys-devel/lld is unstable
 www-client/firefox clang
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 759c9247e3a4..8340d8bc4b2f 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Ben Kohler <bkohler@gentoo.org> (2019-12-30)
+# Masked until we get a stable net-wireless/iwd version
+iwd
+
 # Matt Turner <mattst88@gentoo.org> (2019-12-05)
 # Mask for testing. Bug 606924
 libglvnd