gentoo resync : 27.10.2021

2 files changed, 13 insertions, 10 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 433e46b81846..860878e5c348 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Jakov Smolić <jsmolic@gentoo.org> (2021-10-26)
+# Depends on masked sys-fabric/dapl
+sys-fabric/ofed dapl
+
 # Conrad Kostecki <conikost@gentoo.org> (2021-10-23)
 # Build tools is currently broken, so masking until upstream fixes
 # See https://voidpoint.io/terminx/eduke32/-/issues/206
@@ -209,10 +213,6 @@ dev-libs/efl efl-one
 # The respective dependencies are masked for removal.
 app-metrics/collectd collectd_plugins_onewire
 
-# Michał Górny <mgorny@gentoo.org> (2020-08-22)
-# These flags depend on packages masked for removal due to py2.
-sci-geosciences/qgis grass
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
 # Only supported on 64bit systems, see storage/columnstore/CMakeLists.txt
 dev-db/mariadb columnstore
@@ -223,11 +223,6 @@ dev-db/mariadb columnstore
 # distutils_enable_sphinx to build docs.
 <=dev-python/lockfile-0.12.2-r2 doc
 
-# Michał Górny <mgorny@gentoo.org> (2020-07-27)
-# Requires Python 2 support in xapian-bindings which in turn require
-# Python 2 in dev-python/sphinx.
-<www-apps/roundup-3 xapian
-
 # Brian Dolbec <dolsen@gentoo.org> (2020-07-20)
 # Required dependencies are not yet in the Gentoo ebuild tree
 # Please file a bug if this feature is needed
diff --git a/profiles/base/package.use.stable.force b/profiles/base/package.use.stable.force
index bac5f6a6f2f2..888ae45e9dd2 100644
--- a/profiles/base/package.use.stable.force
+++ b/profiles/base/package.use.stable.force
@@ -1,9 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 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.force
 
+# Sam James <sam@gentoo.org> (2021-10-26)
+# Force USE=daemon for now because current versions of PA ebuilds need
+# complicated package.use changes to satisfy REQUIRED_USE with -daemon
+# We want users to be able to benefit from the other PA 15 fixes, so
+# force this on for now, to be revisited once libpulse split is complete
+# in Gentoo. bug #820332
+media-sound/pulseaudio daemon
+
 ## Kent Fredric <kentnl@gentoo.org> (2019-07-11)
 # The absense of these features require dev-perl/GD, which currently
 # can't be considered stable due to serious defects upstream.