profiles: Move media-video/vlc[aom] into arches package.use.mask

Consolidate vlc USE masks.

6 files changed, 22 insertions, 20 deletions

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 797a1d4a7c84..4aad6c2325a0 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for arm, bug #653800
+# projectm not yet keyworded, bug #314969
+media-video/vlc aom chromaprint microdns opencv projectm
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux.
 app-admin/diamond mongo
@@ -11,10 +17,6 @@ mail-client/mutt notmuch
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm, bug #653800
-media-video/vlc microdns
-
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Feb 2018)
 # Depends on not yet keyworded dev-python/geoip-python. Bug #636860
 net-p2p/deluge geoip
@@ -510,9 +512,6 @@ app-admin/gkrellm ntlm
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
 # Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 12a834747ad3..fadead2adf86 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
 # net-libs/srt not yet keyworded
 # net-libs/libmicrodns not yet keyworded, bug #653800
 # projectm not yet keyworded, bug #314969
 # net-misc/freerdp not yet keyworded
-media-video/vlc chromaprint microdns opencv projectm rdp srt
+media-video/vlc aom chromaprint microdns opencv projectm rdp srt
 
 # Mart Raudsepp <leio@gentoo.org> (13 May 2018)
 # Not bothering with otherwise p.masked old gcc for the
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2555d54d3e90..1ee25ab59830 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
+media-video/vlc aom microdns
+
 # Anthony G. Basile <blueness@gentoo.org> (14 Apr 2018)
 # net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
 net-vpn/tor test
@@ -17,10 +22,6 @@ app-emulation/qemu capstone
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
-media-video/vlc microdns
-
 # Amy Liffey <amynka@gentoo.org (21 Jan 2018)
 # dev-libs/cereal not keyworded for ppc
 media-libs/opencv contrib_dnn
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 334f1e145a39..2517747adedc 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# Requires USE=qt5 that is masked in this profile.
+media-video/vlc aom skins
+
 # Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
 # Needs sys-libs/libomp which is not keyworded. Leaving the decision
 # whether sys-libs/libomp should eventually be keyworded to when new
@@ -12,10 +17,6 @@
 # no longer have the flag, so no point in keywording it for old.
 sys-devel/llvm ocaml
 
-# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
-# Requires USE=qt5 that is masked in this profile.
-media-video/vlc skins
-
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not keyworded
 # uuid: Needs sys-apps/util-linux which is not keyworded
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 4ce7a76c9bae..131814c8ceee 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+media-video/vlc aom
+
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index df676fb475aa..53273ad59cb4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -100,10 +100,6 @@ dev-qt/qtdemo:4 phonon
 dev-python/PyQt4 phonon
 dev-python/pyside:0 phonon
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
-# Depends on unreleased media-libs/libaom, and 9999 is currently broken
-media-video/vlc aom
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
 # This feature is not ready yet, see bug 146882 comment 26
 sys-libs/glibc compile-locales