gentoo resync : 05.04.2018

2 files changed, 14 insertions, 14 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b051919d7bfb..c8451e2ab5b2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Göktürk Yüksek <gokturk@gentoo.org> (4 Apr 2018)
+# libewf is getting treecleaned (#547418).
+# Starting with sleuthkit-4.6.0, we statically link sleuthkit to a
+# locally compiled libewf. Mask the prior versions.
+<app-forensics/sleuthkit-4.6.0 ewf
+
 # Mart Raudsepp <leio@gentoo.org> (1 Apr 2018)
 # rust[extended] file collides with dev-util/cargo, while everything
 # in tree uses the latter at the moment (#645562)
@@ -62,7 +68,6 @@ app-emulation/fuse backend-svga
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # libewf is going to be removed, bug #547418
 app-admin/testdisk ewf
-app-forensics/sleuthkit ewf
 
 # Patrick McLean <chutzpah@gentoo.org> (6 Mar 2018)
 # Requires dev-libs/boost-1.66 that is unkeyworded/masked
@@ -74,9 +79,9 @@ app-forensics/sleuthkit ewf
 
 # Brian Evans <grknight@gentoo.org> (28 Feb 2018)
 # Mask client-libs USE to force users to install alternative standard pacakges
->=dev-db/mariadb-10.2.13 client-libs
->=dev-db/mysql-5.7 client-libs
->=dev-db/percona-server-5.7 client-libs
+dev-db/mariadb client-libs
+dev-db/mysql client-libs
+dev-db/percona-server client-libs
 
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2018)
 # Depends on obsolete media-libs/phonon[qt4]
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 573fbf87cf4f..a13d34d3003e 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.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 package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
+# Depends on unstable dependencies; qt3d bug #652046
+sci-geosciences/qgis 3d grass
+
 # Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
 # ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)
 ~app-backup/bacula-9.0.6 libressl
@@ -15,7 +19,7 @@ app-emulation/qemu capstone
 # Zac Medico <zmedico@gentoo.org> (9 Mar 2018)
 # The rsync-verify support is not really stable yet.
 # Bugs #649276, #647964
-sys-apps/portage rsync-verify
+<sys-apps/portage-2.3.28 rsync-verify
 
 # Kent Fredric <kentnl@gentoo.org> (3 Mar 2018)
 # Not an officially supported configuration, as it causes unpredictable
@@ -75,11 +79,6 @@ net-dns/dnsmasq libidn2
 # Requires dev-lang/julia stabilisation, bug #613576
 kde-apps/cantor julia
 
-# Andreas Sturmlechner <asturm@gentoo.org> (22 Feb 2017)
-# Requires not yet stabilised sci-geosciences/grass,
-# which probably needs bump to solve several issues.
-sci-geosciences/qgis grass
-
 # Brian Dolbec <dolsen@gentoo.org> (14 Feb 2017)
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
@@ -144,10 +143,6 @@ dev-lang/go gccgo
 # Mask monitoring capabilities of Ganeti on stable branches
 app-emulation/ganeti monitoring
 
-# Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
-# Unmask stable-masked implementations for python-exec
-dev-lang/python-exec -python_targets_python3_6
-
 # Pacho Ramos <pacho@gentoo.org> (15 May 2015)
 # Version compatible with current ffmpeg is not ready to be stabilized
 # bug #539212