gentoo (leap year) resync : 29.02.2020

3 files changed, 21 insertions, 6 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b28fb1ff286b..54fd5dc94279 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,18 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Rick Farina <zerochaos@gentoo.org> (2020-02-26)
+# dev-python/pyzmq USE=doc deps are not met with python2_7
+dev-python/pyzmq doc
+
+# Michał Górny <mgorny@gentoo.org> (2020-02-24)
+# app-admin/packagekit* are masked for removal.
+kde-frameworks/frameworkintegration appstream
+
+# Michał Górny <mgorny@gentoo.org> (2020-02-24)
+# sys-apps/entropy is masked for removal.
+app-admin/packagekit-base entropy
+
 # Michał Górny <mgorny@gentoo.org> (2020-02-08)
 # The dependency is python-single-r1 while the package (and its revdeps)
 # are python-r1.
@@ -80,7 +92,6 @@ media-sound/beets webserver
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-04)
 # Python 2.7 only packages optionally needing dev-python/ipython.
-app-misc/gourmet ipython
 dev-python/restkit cli
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-04)
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 2b4cca266277..12d56e4c5ba4 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 package.use.mask
 
+# Brian Evans <grknight@gentoo.org> (2020-02-27)
+# Two packages are delayed during stable of PHP 7.4
+# arm, arm64 and hppa necessary to not disruput consistency
+# but this will allow all other packages to be used
+# Bug 706180, 710942
+dev-php/pecl-apcu php_targets_php7-4
+dev-php/pecl-yaz php_targets_php7-4
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 8340d8bc4b2f..044879140603 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -12,10 +12,6 @@ iwd
 # Mask for testing. Bug 606924
 libglvnd
 
-# Thomas Deutschmann <whissi@gentoo.org> (28 Nov  2019)
-# Mask PHP 7.4 target while unstable
-php_targets_php7-4
-
 # Patrick Lauer <patrick@gentoo.org> (2019-10-04)
 # No postgres-12 stable yet
 postgres_targets_postgres12