From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- profiles/base/make.defaults | 8 ++++---- profiles/base/package.use.mask | 7 ++++++- profiles/base/package.use.stable.mask | 10 ---------- profiles/base/use.mask | 10 +++++----- profiles/base/use.stable.mask | 6 +++++- 5 files changed, 20 insertions(+), 21 deletions(-) (limited to 'profiles/base') diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index b957a95fa4fc..e82e9643d137 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -64,11 +64,11 @@ GRUB_PLATFORMS="" # By default enable all extensions with no dependencies LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" -# Tomáš Chvátal (15 May 2011) # Andreas K. Hüttel (19 Aug 2011, 25 Mar 2012) # Johannes Huber (15 Apr 2018) -# By default build all calligra features. -CALLIGRA_FEATURES="karbon plan sheets stage words" +# Andreas Sturmlechner (01 Jan 2019) +# By default build all calligra features (except unmaintained: stage). +CALLIGRA_FEATURES="karbon plan sheets words" # Andreas K. Huettel (28 Sep 2010) # Small default list of enabled plugins for collectd @@ -99,7 +99,7 @@ NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb p # Manuel Rüger (09 Sep 2015) # Default Ruby build target(s) # Updated to include ruby24 on 12 Nov 2018 -RUBY_TARGETS="ruby23 ruby24" +RUBY_TARGETS="ruby24" # Samuli Suominen (03 Dec 2009) # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 82ac3f93ec4f..203f9d99c71b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires >=portage-2.1.1 @@ -7,6 +7,11 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Brian Evans (11 Jan 2019) +# Depend on the EOL PHP 7.0 +dev-libs/Ice php +www-servers/nginx-unit php7-0 + # Michał Górny (01 Dec 2018) # Moved from use.mask to specific packages. # Andreas Sturmlechner (10 May 2018) diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 48dfc33ec062..c2d1aaa5bcb8 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -16,12 +16,6 @@ app-admin/sudo sssd # app-misc/ddcutil is not yet stable. kde-plasma/powerdevil brightness-control -# Andreas Sturmlechner (11 Sep 2018) -# Sometimes crashes Plasma with Appstream versions pre-0.12. -# Newer versions of dev-libs/appstream are not stable yet. See also: -# https://mail.kde.org/pipermail/kde-distro-packagers/2018-September/000347.html -kde-plasma/plasma-desktop appstream - # Michał Górny (07 Jun 2018) # sys-libs/netbsd-csu not stable yet. sys-devel/clang-runtime crt @@ -38,10 +32,6 @@ media-video/vlc aom srt # Depends on lots of unstable dependencies dev-python/s3fs test -# Andreas Sturmlechner (22 Apr 2018) -# Huge patchset in 6.0, early crash reports with fix in ~arch KF5/Plasma-5 -=app-office/libreoffice-6.0* kde - # Andreas Sturmlechner (03 Mar 2018) # sci-geosciences/grass is not stable sci-geosciences/qgis grass diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 50595c64203a..b814ac9064a9 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -1,9 +1,13 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Brian Evans (11 Jan 2019) +# Mask PHP 7.0 target as EOL +php_targets_php7-0 + # Matt Turner (11 Nov 2018) # d3d9 only works on amd64/x86. d3d9 @@ -12,10 +16,6 @@ d3d9 # Mask PostgreSQL 12 while in (pre-)alpha. postgres_targets_postgres12 -# Brian Evans (10 Aug 2018) -# Mask PHP 7.3 target while in beta -php_targets_php7-3 - # Matt Turner (23 Nov 2017) # For ancient hardware. Tired of maintaining. Masked for removal in 30 days. # Bug #606132. diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index 2ec6d823cff8..2f3562ed47e0 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -1,9 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Brian Evans (11 Jan 2019) +# Mask PHP 7.3 target while unstable +php_targets_php7-3 + # Zac Medico (01 Sep 2016) # Needs virtual/pypy* stable python_targets_pypy -- cgit v1.2.3