summaryrefslogtreecommitdiff
path: root/profiles/base
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
commite3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree9cb29a544215119b5c5538e37211b994ce1c87ae /profiles/base
parent480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
gentoo resync : 04.08.2018
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/make.defaults8
-rw-r--r--profiles/base/package.use.mask6
-rw-r--r--profiles/base/package.use.stable.mask8
3 files changed, 14 insertions, 8 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7c2500320aaf..01744a72fa90 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,14 +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
-# Michał Górny <mgorny@gentoo.org> (22 Jun 2018)
+# Mikle Kolyada <zlogene@gentoo.org> (24 Jul 2018)
# Updated to python3_6
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
+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 25cae1754c34..adcfa1f3ca18 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.
+# Andreas K. Hüttel <dilfridge@gentoo.org> (3 Aug 2018)
+# New and for Gentoo still quite experimental. You've been
+# warned. (Also, works only on x86_64 and with certain CPUs
+# and compiler/binutils combinations.)
+sys-libs/glibc cet
+
# Nick Sarnie <sarnex@gentoo.org> (15 Jul 2018)
# Requires media-video/ffmpeg-4 which is masked
app-emulation/wine-any ffmpeg
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 56babc9b2196..6f64db71a53f 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> (22 Jul 2018)
+# >=media-video/libav-12 not stable yet, bug #617508
+>=media-libs/mlt-6.6.0 libav
+
# Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
# sys-libs/netbsd-csu not stable yet.
sys-devel/clang-runtime crt
@@ -26,10 +30,6 @@ dev-python/s3fs test
# Not ready for stable, crashes LO on some systems.
>=app-office/libreoffice-6.0 kde
-# Michał Górny <mgorny@gentoo.org> (21 Apr 2018)
-# Apparently requires newer dev-python/django stable.
-=dev-python/django-tastypie-0.13.3 doc
-
# Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
# Depends on unstable dependencies; qt3d bug #652046
sci-geosciences/qgis 3d grass