From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- profiles/base/make.defaults | 5 ++--- profiles/base/package.use.mask | 7 ------- profiles/base/use.mask | 10 +++++----- 3 files changed, 7 insertions(+), 15 deletions(-) (limited to 'profiles/base') diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 01744a72fa90..a0a1d4f977ba 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -135,10 +135,9 @@ PYTHON_SINGLE_TARGET="python3_6" # Michał Górny (10 Aug 2013) # Moved from portage's make.globals. # 1) do not uninstall kernel modules and therefore allow replacing them, -# 2) allow replacing unowned compiled Python modules (python-r1 migration), -# 3) allow replacing unowned dropin.cache files (twisted-r1 migration). +# 2,3) removed wrt bug #663170, # 4) protect /var/{run,lock} symlinks for bug 519620 -COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache" +COLLISION_IGNORE="/lib/modules/*" UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" # Andreas K. Hüttel (23 Aug 2013) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index fd2b151749f7..7074d96eb53f 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,11 +7,6 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. -# Mike Gilbert (05 Aug 2018) -# Fails to build. -# https://bugs.gentoo.org/661880 ->=www-client/chromium-69 system-icu - # Andreas K. Hüttel (3 Aug 2018) # New and for Gentoo still quite experimental. You've been # warned. (Also, works only on x86_64 and with certain CPUs @@ -35,13 +30,11 @@ sci-libs/ViSP qt4 # Andreas Sturmlechner (18 Jun 2018) # dev-python/PyQt4 and dev-python/pyside are dead and going away. dev-python/pandas X -media-sound/pulseaudio qt4 media-video/syncplay gui net-wireless/gnuradio qt4 # Pacho Ramos (17 Jun 2018) # dev-libs/DirectFB is being removed (#606194) -media-libs/libsdl2 fusionsound media-libs/xine-lib fusionsound www-plugins/gnash directfb diff --git a/profiles/base/use.mask b/profiles/base/use.mask index b35a30ebccb7..560311c41759 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -1,9 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # 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 (10 Aug 2018) +# Mask PHP 7.3 target while in beta +php_targets_php7-3 + # Andreas Sturmlechner (10 May 2018) # media-sound/mumble is masked/not keyworded at this point, bug #656826. mumble @@ -102,10 +106,6 @@ netlink # could suffer unexpected problem, don't expect support for it then. openrc-force -# Brian Evans (2 Dec 2015) -# php 5.4 is end of life, masked for removal -php_targets_php5-4 - # Brian Evans (22 Aug 2016) # php 5.5 is end of life, masked for removal php_targets_php5-5 -- cgit v1.2.3