From 76dfef0cec9170000357d2f354e412daf48941fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 Dec 2017 01:11:30 +0000
Subject: gentoo resync : 30.12.2017

---
 profiles/base/package.use.force |  4 ----
 profiles/base/package.use.mask  | 20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'profiles/base')

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 542fd1e2f658..eac52509172d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -44,10 +44,6 @@ dev-lang/python threads
 # https://bugs.webkit.org/show_bug.cgi?id=136831
 >=net-libs/webkit-gtk-2.8 X
 
-# Alexnader Vershilov <qnikst@gentoo.org> (04 Nov 2014)
-# Due to bug #490604: version without oracle is not supported
->=dev-db/tora-2.1.3 oracle
-
 # Justin Lecher <jlec@gentoo.org> (10 Aug 2014)
 # Doesn't work without acl support
 # No patch yet, #516626
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e29ab67077ba..15745796e61f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,21 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andrey Utkin <andrey_utkin@gentoo.org> (29 Dec 2017)
+# This flag can be sensibly enabled only on macos.
+# Can be unmasked in prefix/darwin/macos profiles. Bug #637482
+media-video/ffmpeg appkit
+
+# Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
+# The whole zeitgeist stuck is dead (#629180)
+gnome-extra/synapse zeitgeist
+www-client/midori zeitgeist
+app-editors/gedit-plugins zeitgeist
+app-misc/bijiben zeitgeist
+dev-libs/folks zeitgeist
+media-sound/rhythmbox zeitgeist
+media-video/totem zeitgeist
+
 # Pacho Ramos <pacho@gentoo.org> (27 Dec 2017)
 # We will remove ptlib, its support was broken anyway (#624578).
 net-voip/yate h323
@@ -414,11 +429,6 @@ dev-db/mysql cluster
 # is implemented. Masking for testing and evaluation.
 app-admin/clsync cluster mhash
 
-# Michał Górny <mgorny@gentoo.org> (30 Nov 2014)
-# Not supported at the moment. DirectFB lacks multilib support,
-# and we have to decide if we want it.
-x11-libs/cairo directfb
-
 # Brian Evans <grknight@gentoo.org> (29 Nov 2014)
 # Strongly recommened by upstream to disable lzo and zlib due to memory leaks
 # https://github.com/groonga/groonga/issues/6 (Japanese)
-- 
cgit v1.2.3