From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 16 Apr 2018 16:47:37 +0100
Subject: gentoo resync : 16.04.2018

---
 profiles/base/make.defaults           | 5 +++--
 profiles/base/package.use.mask        | 2 +-
 profiles/base/package.use.stable.mask | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'profiles/base')

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 799b0d1a90b6..bd038bebf167 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -46,8 +46,9 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (15 May 2011)
 # Andreas K. Hüttel <dilfridge@gentoo.org> (19 Aug 2011, 25 Mar 2012)
-# By default build all koffice / calligra features.
-CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author"
+# Johannes Huber <johu@gentoo.org> (15 Apr 2018)
+# By default build all calligra features.
+CALLIGRA_FEATURES="karbon plan sheets stage words"
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
 # Small default list of enabled plugins for collectd
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index eefe86cb32c4..0a8dd471109c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -143,7 +143,7 @@ dev-java/oracle-jre-bin:9 gentoo-vm
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Requires audacious, which is masked. Bug 632513
-=media-libs/freeverb3-3.1.2_pre20151102-r1 jack
+media-libs/freeverb3 jack
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
 # USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 77fe69bcefe1..9d0606481eeb 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -93,10 +93,6 @@ media-plugins/kipi-plugins mediawiki vkontakte
 # Requires testing version of media-libs/opencv
 media-libs/mlt opencv
 
-# Matthias Maier <tamiko@gentoo.org> (22 Jan 2017)
-# sys-fs/zfs isn't going to be marked stable anytime soon
-app-emulation/libvirt zfs
-
 # Michael Palimaka <kensington@gentoo.org (18 Jan 2017)
 # www-client/weboob is horribly outdated and not stable
 app-office/kmymoney weboob
-- 
cgit v1.2.3