From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 23 Jun 2018 07:00:28 +0100
Subject: gentoo resync : 23.06.2018

---
 profiles/base/make.defaults    | 11 ++++++-----
 profiles/base/package.use.mask |  8 +++++++-
 profiles/base/use.mask         |  4 ----
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'profiles/base')

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b41ecfa1f279..71d6be12f645 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # System-wide defaults for the Portage system
@@ -123,13 +123,14 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (23 May 2018)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_6 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
-# Updated to python3_5 on 28 Nov 2017
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
+# Michał Górny <mgorny@gentoo.org> (22 Jun 2018)
+# Updated to python3_6
+PYTHON_TARGETS="python2_7 python3_6"
+PYTHON_SINGLE_TARGET="python3_6"
 
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 960aeced1fbc..5b96db88c846 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,11 +7,17 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# dev-libs/DirectFB is being removed (#606194)
+media-libs/libsdl2 fusionsound
+media-libs/xine-lib fusionsound
+www-plugins/gnash directfb
+
 # Michał Górny <mgorny@gentoo.org> (13 Jun 2018)
 # Requires app-arch/snappy[static-libs] that is no longer available.
 # Bugs #651604, #651606.
 app-emulation/qemu static
-dev-libs/leveldb static-libs
+<dev-libs/leveldb-1.20 static-libs
 sys-block/fio static
 sys-cluster/ceph static-libs
 
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 5b09e2890c89..318e04eaaf3c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -13,10 +13,6 @@ video_cards_tdfx
 # ... since audacious is being last-rited ... bug 632513
 audacious
 
-# Patrick Lauer <patrick@gentoo.org> (22 Oct 2017)
-# postgres-9.2 is EOL and masked
-postgres_targets_postgres9_2
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 elogind
-- 
cgit v1.2.3