gentoo resync : 19.03.2019

30 files changed, 107 insertions, 83 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 474822874bbc..158c4fdff843 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Tobias Klausmann <klausman@gentoo.rog> (23/Nov/2018)
@@ -261,6 +261,7 @@ dev-haskell/vector test
 # Tobias Klausmann <klausman@gentoo.org> (20 Nov 2014)
 # OpenCV likely will never work on Alpha
 media-video/vlc opencv
+media-gfx/shotwell opencv
 
 # Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
 # Missing keywords, bug #523686
@@ -384,9 +385,6 @@ media-plugins/gst-plugins-meta dts libvisual
 # needs sys-libs/libcap-ng that is masked right now
 sys-apps/smartmontools caps
 
-# Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
 # legacy mask
 www-client/elinks javascript
 
diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force
index 4706847d448c..36c6e4aadf94 100644
--- a/profiles/arch/amd64-fbsd/clang/package.use.force
+++ b/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force building libc++ over libcxxrt.
@@ -12,9 +12,6 @@ sys-libs/libcxx static-libs abi_x86_32
 # libcxx on this profile. Mask the other ssl providers.
 net-misc/curl ssl curl_ssl_openssl
 
-# We obviously need clang
-sys-devel/llvm clang static-analyzer default-compiler-rt default-libcxx
-
 # o-flag-munging is required to compile dev-libs/libgcrypt with clang.
 # https://bugs.gentoo.org/629410
 dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
index 6c7737109a3a..3b36252505ee 100644
--- a/profiles/arch/amd64-fbsd/package.use.force
+++ b/profiles/arch/amd64-fbsd/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (09 Mar 2018)
@@ -12,6 +12,7 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 74c81944764f..ec4e5b7ad705 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -89,17 +89,6 @@ virtual/notification-daemon kde
 # Requires USE=seccomp that is masked in this profile.
 net-libs/gnutls test-full
 
-# 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
-# LLVM is going to be keyworded.
-<sys-devel/clang-runtime-4 openmp
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
-# no longer have the flag, so no point in keywording it for old.
-sys-devel/llvm ocaml
-
 # Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
 # Needs net-mail/mailutils which is not keyworded, bug #635216.
 app-editors/emacs mailutils
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 4fda87811fdd..b07d574030dc 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -118,7 +118,6 @@ games-rpg/eschalon-book-1-demo
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/nwn-ded
-games-server/ut2003-ded
 games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
@@ -142,8 +141,3 @@ sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-electronics/eagle
 sys-libs/lib-compat-loki
-
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub-1 is not available on no-multilib-profiles
-<sys-boot/grub-1.99
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 8791ceed9e5d..cefb8e872492 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mike Gilbert <floppym@gentoo.org> (17 Nov 2016)
@@ -8,6 +8,7 @@ sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index fd348f9dde13..5c86f6ef2ce8 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -20,6 +20,7 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 2ef3579e88ca..165771769678 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
+# sys-block/megactl works on x86 and amd64
+www-apps/phpsysinfo -megactl
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (05 March 2019)
+# freeipmi is supported on amd64
+app-admin/conserver -freeipmi
+
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is supported on amd64
 net-vpn/strongswan -strongswan_plugins_rdrand
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index b7a078cf4d66..3e52fa707e06 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (16 Feb 2019)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_ARM
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
 
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 4ba40fee5a52..82ba63950d02 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Anthony G. Basile <blueness@gentoo.org> (16 Mar 2019)
+# to avoid a circular dependency
+dev-python/async_timeout test
+
+# Anthony G. Basile <blueness@gentoo.org> (8 Mar 2019)
+# hipe code is missing in erlang for arm
+dev-lang/erlang hipe
+net-im/ejabberd hipe
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # media-libs/dav1d is not yet keyworded
 media-video/vlc dav1d
@@ -96,10 +105,6 @@ dev-cpp/xsd ace
 games-fps/doom-data doomsday
 media-tv/tvheadend hdhomerun
 
-# Michał Górny <mgorny@gentoo.org> (21 Dec 2017)
-# clang is not currently supported on Gentoo ARM profiles.
-sys-devel/llvm clang lldb
-
 # Michał Górny <mgorny@gentoo.org> (29 Nov 2017)
 # All current clang versions are broken on ARM.
 app-doc/doxygen clang
@@ -391,7 +396,7 @@ media-gfx/fim graphicsmagick svg
 
 # Markus Meier <maekke@gentoo.org> (04 Aug 2013)
 # Unkeyworded deps, bug #474026
-app-admin/conky audacious cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
+app-admin/conky cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 
 # Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
 # Not tested
@@ -466,7 +471,7 @@ app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_ex
 
 # Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
 # No java on ARM
-net-analyzer/wireshark doc-pdf bcg729 maxminddb
+net-analyzer/wireshark bcg729 maxminddb
 
 # Markus Meier <maekke@gentoo.org> (25 Jul 2012)
 # no stable media-video/vlc yet, bug #401313
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 65ff7bc3be78..47988b29f588 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_AArch64
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
 
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index b4783d9b47fa..80f617fb1951 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,27 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (11 Mar 2019)
+# media-libs/bcg729 not keyworded yet
+net-analyzer/wireshark bcg729
+
+# Roy Bamford <neddyseagoon@gentoo.org> (11 Mar 2019)
+# net-misc/dropbox is binary amd64/x86 only
+kde-apps/kdenetwork-meta dropbox
+
+# Roy Bamford <neddyseagoon@gentoo.org> (10 Mar 2019)
+# sci-chemistry/openbabel is not keyworded/fails to build
+kde-apps/kalzium editor
+
+# Roy Bamford <neddyseagoon@gentoo.org> (10 Mar 2019)
+# No arm64 ever had bios, but sys-apps/fwupdate needs
+# to be refactored to separate bios and uefi
+kde-plasma/discover firmware
+
+# Jimi Huotari <chiitoo@gentoo.org> (10 Mar 2019)
+# dev-qt/qttranslations is not yet keyworded, bug #680082
+lxqt-base/lxqt-meta nls
+
 # Mart Raudsepp <leio@gentoo.org> (23 Feb 2019)
 # x11-libs/libXTrap not keyworded yet
 x11-misc/x11vnc xtrap
@@ -445,7 +466,7 @@ media-gfx/fim graphicsmagick svg
 
 # Markus Meier <maekke@gentoo.org> (04 Aug 2013)
 # Unkeyworded deps, bug #474026
-app-admin/conky lua-cairo lua-imlib xmms2 audacious moc
+app-admin/conky lua-cairo lua-imlib xmms2 moc
 
 # Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
 # Not tested
@@ -506,10 +527,6 @@ app-accessibility/speech-dispatcher flite
 # mask app-office/libreoffice java extensions
 app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher
 
-# Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
-# No java on ARM
-net-analyzer/wireshark doc-pdf
-
 # Markus Meier <maekke@gentoo.org> (25 Jul 2012)
 # no stable media-video/vlc yet, bug #401313
 media-libs/phonon vlc
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f23bc4dc80c7..9de0da048308 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
+# sys-block/megactl works only on amd64 and x86 so far, bug #670564
+www-apps/phpsysinfo megactl
+
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is only supported on amd64 and x86
 # - padlock plugin is only supported on amd64 and x86
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f10edb643a69..21f228d2646d 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
@@ -203,10 +203,6 @@ app-office/lyx gnumeric
 # Needs Java (bug #355353)
 app-text/texlive pdfannotextractor
 
-# Jeroen Roovers <jer@gentoo.org> (30 Nov 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
-
 # Justin Lecher <jlec@gentoo.org> (13 Aug 2010)
 # MKL not available on this arch
 media-gfx/povray mkl
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index a7a0cfd5e41c..f0bc4b53d240 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (17 Mar 2019)
+# net-analyzer/nagios (or icinga) has no stable keywords, bug #676222
+sys-libs/freeipmi nagios
+
 # Andreas Sturmlechner <asturm@gentoo.org> (02 Dec 2018)
 # gnome-base/nautilus is not stable
 media-sound/easytag nautilus
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index f598c4237707..b2b9113b7138 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/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
 
+# Sergei Trofimovich <slyfox@gentoo.org> (03 Mar 2019)
+# No stable sys-apps/systemd on hppa.
+systemd
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 openal
 
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 335bbb7b5e0f..0dbd7ed84bce 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
+# Unkeyworded media-libs/opencv dependency, bug #680656
+media-gfx/shotwell opencv
+
 # Sergei Trofimovich <slyfox@gentoo.org> (13 Oct 2018)
 # USE=debug needs support for target-specific _FPU_MASK_IM. ia64
 # does not define those.
@@ -184,7 +188,6 @@ sys-apps/systemd -gnuefi
 # James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
 # Requires dev-java/fop but we don't support java on ia64.
 gnome-extra/libgda reports
-net-analyzer/wireshark doc-pdf
 
 # Pacho Ramos <pacho@gentoo.org> (13 Jun 2015)
 # Missing keywords, bug #513108
diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force
index 42de426a5838..9dea18f73958 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index 511499b838d0..a010945c966c 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (25 Dec 2018)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_PowerPC
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index c3ba2ea58826..8fc5fa04d409 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Virgil Dupras <vdupras@gentoo.org> (03 Mar 2019)
+# Tests fail with jpeg2k flag. Bug #662686
+dev-python/pillow jpeg2k
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # media-libs/dav1d is not yet keyworded
 media-video/vlc dav1d
@@ -147,10 +151,6 @@ net-wireless/blueman appindicator
 # x11-drivers/xf86-video-amdgpu is not keyworded
 x11-base/xorg-drivers video_cards_amdgpu
 
-# Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
-# Dependencies missing keywords, bug #543604
-sys-devel/llvm ocaml
-
 # Gilles Dartiguelongue <eva@gentoo.org> (10 Jun 2015)
 # net-libs/dleyna-connector-dbus lack ppc/ppc64 keyword, bug #551634
 >=media-plugins/grilo-plugins-0.2.14 upnp-av
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 3bafbbbb34da..3c5c02df47d0 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
@@ -59,7 +59,6 @@ app-text/tesseract scrollview
 app-text/texlive pdfannotextractor
 dev-lang/logtalk fop
 gnome-extra/libgda reports
-net-analyzer/wireshark doc-pdf
 
 # Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015)
 # Mask x265 on vlc for bug #564138
diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force
index 92bb466ea4ad..1c07ebd158c3 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (11 Nov 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_SystemZ
 sys-devel/clang llvm_targets_SystemZ
 sys-devel/llvm llvm_targets_SystemZ
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index c202aa04c6dc..76457771a8f8 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU
 sys-devel/clang llvm_targets_AMDGPU
 sys-devel/llvm llvm_targets_AMDGPU
 
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index dbbc84463184..e629d210eb5b 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Sparc
 sys-devel/clang llvm_targets_Sparc
 sys-devel/llvm llvm_targets_Sparc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 8034a36b298c..263ceeae41a8 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (28 Sep 2018)
@@ -170,10 +170,6 @@ dev-python/restkit cli
 # Requires wifi USE flag, which is masked for this arch
 net-misc/networkmanager wext
 
-# Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
-# Dependencies missing keywords, bug #543604
-sys-devel/llvm ocaml
-
 # Pacho Ramos <pacho@gentoo.org> (13 Jun 2015)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
@@ -340,10 +336,6 @@ media-plugins/gst-plugins-meta dts dv libvisual modplug vcd wavpack
 # dev-libs/libev is not keyworded
 www-servers/lighttpd libev
 
-# Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
-
 # Justin Lecher <jlec@gentoo.org> (13 Aug 2010)
 # MKL not available on this arch
 media-gfx/povray mkl
diff --git a/profiles/arch/x86-fbsd/package.use.force b/profiles/arch/x86-fbsd/package.use.force
index ca264fedc8ce..553802649559 100644
--- a/profiles/arch/x86-fbsd/package.use.force
+++ b/profiles/arch/x86-fbsd/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index f10c46a94985..8d7639315abc 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
@@ -8,17 +8,6 @@
 # skins requires USE=qt5 that is masked in this profile.
 media-video/vlc aom aribsub dav1d 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
-# LLVM is going to be keyworded.
-<sys-devel/clang-runtime-4 openmp
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
-# no longer have the flag, so no point in keywording it for old.
-sys-devel/llvm ocaml
-
 # 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 b/profiles/arch/x86/package.use
index 4aa1c4ffcd91..408c7a4da0bf 100644
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 69bbbf335c38..c0f5156c9631 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_X86
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b48ed6736c5b..90514058b93c 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,18 @@
 
 # This file requires >=portage-2.1.1
 
+# Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
+# sys-block/megactl works on x86 and amd64
+www-apps/phpsysinfo -megactl
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (05 March 2019)
+# freeipmi is supported on x86
+app-admin/conserver -freeipmi
+
+# Mikle Kolyada <zlogene@gentoo.org> (03 Mar 2019)
+# No Spice protocol for x86
+app-emulation/nemu spice
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # media-libs/dav1d is not yet keyworded
 media-video/vlc dav1d