gentoo resync : 24.03.2019

5 files changed, 15 insertions, 5 deletions

diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index ec4e5b7ad705..ef07b2f1d642 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (20 Mar 2019)
+# Z3 fails to link on FreeBSD but linker produces no error messages.
+sys-devel/clang z3
+
 # Michał Górny <mgorny@gentoo.org> (22 Jan 2019)
 # Missing keywords on dependencies.
 app-arch/libarchive zstd
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 0a5c3b5582f0..6444d0683144 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -62,7 +62,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-3.3.6 frei0r sofalizer
+<=media-video/ffmpeg-3.4.5 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
 # No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 80f617fb1951..0095e26e090e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Roy Bamford <neddyseagoon@gentoo.org> (19 Mar 2019)
+# Let kde-apps/akonadi use mysql.
+dev-qt/qtsql -mysql
+kde-apps/akonadi -mysql
+
+# Andreas Sturmlechner <asturm@gentoo.org> (19 Mar 2019)
+# mail-filter/spamassassin is not yet keyworded
+kde-apps/kdepim-meta spamassassin
+
 # Mart Raudsepp <leio@gentoo.org> (11 Mar 2019)
 # media-libs/bcg729 not keyworded yet
 net-analyzer/wireshark bcg729
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 6b99d3b07714..72fce6c2649b 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -118,9 +118,6 @@ oracle
 video_cards_geode
 video_cards_voodoo
 
-# not needed on non-mips systems
-video_cards_newport
-
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
 video_cards_ast
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
index 7241d23bfa2b..09430714177a 100644
--- a/profiles/arch/mips/make.defaults
+++ b/profiles/arch/mips/make.defaults
@@ -3,7 +3,7 @@
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev impact newport"
+VIDEO_CARDS="fbdev impact"
 
 ARCH="mips"
 ACCEPT_KEYWORDS="${ARCH} ~mips"