summaryrefslogtreecommitdiff
path: root/profiles/base
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-25 15:22:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-25 15:22:17 +0100
commit22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (patch)
tree808b5701901fb54b53ec3ecf6f33272e933f3ea6 /profiles/base
parent91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (diff)
gentoo resync : 25.05.2018
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/make.defaults4
-rw-r--r--profiles/base/package.use.mask16
2 files changed, 15 insertions, 5 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ddfdd8f215b0..bfb6fd69d208 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -121,7 +121,9 @@ PYTHONDONTWRITEBYTECODE="1"
# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}"
# This MUST be kept in sync with the PYTHON_TARGETS below
-BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_5 python_targets_python2_7"
+# 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"
# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
# Default target(s) for python-r1.eclass
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53273ad59cb4..518a65f3f352 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,14 +7,22 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# kdelibs4 is dead and going away. Bug #645558
+<app-office/libreoffice-6.0 kde
+<app-office/libreoffice-bin-6.0 kde
+<app-office/libreoffice-bin-debug-6.0 kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# Qt4 is dead and going away.
+kde-plasma/plasma-desktop qt4
+kde-plasma/breeze qt4
+kde-plasma/oxygen qt4
+
# Michał Górny <mgorny@gentoo.org> (16 May 2018)
# Depends on last-rited sci-libs/coinhsl.
sci-libs/ipopt hsl
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on obsolete dev-libs/sni-qt and dead Qt4.
-kde-plasma/plasma-desktop qt4
-
# Mike Gilbert <floppym@gentoo.org> (01 May 2018)
# Requires >=media-video/ffmpeg-4 (bug 654208).
>=www-client/chromium-67 system-ffmpeg