gentoo resync : 05.04.2019

5 files changed, 19 insertions, 19 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7e04c424dd49..7fc93d902675 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -5,7 +5,7 @@
 # See portage(5) manpage
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
-IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
+IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 0e523f3f5833..a4f67f42aa5b 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2019)
+# USE="-gnutls" is broken (#675694)
+>=net-fs/samba-4.10.0_rc1 gnutls
+
 # Mart Raudsepp <leio@gentoo.org> (14 Dec 2018)
 # Security is not optional if available for the architecture/kernel.
 gnome-base/gnome-desktop seccomp
@@ -72,7 +76,6 @@ app-shells/bash:0 readline
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
 dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_4
 dev-lang/python-exec python_targets_python3_5
 dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9905ca28b3f3..97c7a2ddd346 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,18 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (31 Mar 2019)
+# dev-libs/grok is slated for removal.
+app-admin/rsyslog grok
+
+# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
+# x11-wm/afterstep is slated for removal.
+x11-terms/aterm background
+
+# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
+# net-mail/uw-imap masked for removal.
+dev-perl/NetxAP test
+
 # Michał Górny <mgorny@gentoo.org> (16 Mar 2019)
 # Requires last rited dev-python/scimath.
 dev-python/construct python_targets_python2_7
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e3b7c47692e5..a18c16751d10 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -141,10 +141,6 @@ app-admin/packagekit-base entropy
 dev-db/mariadb sst-xtrabackup
 dev-db/mariadb-galera sst-xtrabackup
 
-# William Hubbs <williamh@gentoo.org (13 Apr 2016)
-# Needs gcc-5 which is currently unstable
-dev-lang/go gccgo
-
 # Sergey Popov <pinkbyte@gentoo.org> (15 Feb 2016)
 # Mask monitoring capabilities of Ganeti on stable branches
 app-emulation/ganeti monitoring
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 3b9cbbf595f1..e3a5778afb95 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,13 +4,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Matt Turner <mattst88@gentoo.org> (02 Mar 2019)
-# For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
-# Bug #679256
-video_cards_newport
-video_cards_tdfx
-video_cards_voodoo
-
 # Brian Evans <grknight@gentoo.org> (11 Jan 2019)
 # Mask PHP 7.0 target as EOL
 php_targets_php7-0
@@ -27,10 +20,6 @@ postgres_targets_postgres12
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Unkeyworded on most arches, unmasked in supported arch profiles.
-elogind
-
 # CURL_SSL=winssl is for prefix/windows/winnt only
 curl_ssl_winssl
 
@@ -84,8 +73,8 @@ coreaudio
 # Jeremy Olexa <darkside@gentoo.org>
 # The prefix USE flags should never be used on non prefix profiles
 prefix
-prefix-chain
 prefix-guest
+prefix-stack
 
 # Diego E. Pettenò <flameeyes@gentoo.org> (19 Oct 2010)
 # masking flags that only apply to FreeBSD