gentoo resync : 19.03.2019

2 files changed, 13 insertions, 7 deletions

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