gentoo resync : 05.12.2021

6 files changed, 35 insertions, 14 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4aa838bae261..f25074f9d81a 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -171,7 +171,7 @@ PHP_TARGETS="php7-3 php7-4"
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
 # Default ADA target
-ADA_TARGET="gnat_2019"
+ADA_TARGET="gnat_2020"
 
 # Marek Szuba <marecki@gentoo.org> (2020-10-15)
 # Default targets for lua{,-single}.eclass
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index c617fe47edc1..58f5f5ac5739 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-11-22)
+# Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease
+# dependency resolution. In a fair number of cases, this has helped
+# upgrades go through cleanly.
+# Read the news item if you need help!
+# (This mask is undone in musl profiles where the transition is not yet being
+# made.)
+# bug #699422.
+virtual/libcrypt:0/1
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-06)
 # No longer maintained upstream; please see the 2021-07-15-opentmpfiles-deprecation
 # news item.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7ce0397f682b..b026e63bec52 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,9 +6,20 @@
 # 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
+# Wolfgang E. Sanyer <ezzieyguywuf@gmail.com> (2021-12-01)
+# Requires pandoc, which is unstable due to various haskell dependencies
+# (including ghc)
+>=sys-apps/exa-0.10.1 man
+
+# Sam James <sam@gentoo.org> (2021-11-26)
+# Needs unpackaged asciidoctor-pdf for now
+# bug #827290
+>=app-doc/kicad-doc-6.0.0_rc1 pdf
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-23)
+# pdfannotextractor gets masked as it does not support
+# updated dev-java/pdfbox-2.0.24, Bug #803488
+app-text/texlive pdfannotextractor
 
 # Conrad Kostecki <conikost@gentoo.org> (2021-10-23)
 # Build tools is currently broken, so masking until upstream fixes
@@ -189,11 +200,6 @@ x11-libs/colord-gtk doc
 <sys-devel/clang-14 llvm_targets_CSKY llvm_targets_M68k
 <sys-devel/llvm-14 llvm_targets_CSKY llvm_targets_M68k
 
-# Joonas Niilola <juippis@gentoo.org> (2020-12-03)
-# Doc building seem to be very random without any predictability,
-# bug #734104
-media-gfx/blender doc
-
 # Marek Szuba <marecki@gentoo.org> (2020-11-30)
 # Vendored therecipe/qt violates network sandbox + uses external binary
 # Qt libraries; see https://github.com/ProtonMail/proton-bridge/issues/16
@@ -405,6 +411,7 @@ sys-devel/binutils-hppa64 cet
 sys-devel/gdb cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
+sys-devel/gcc cet
 
 # Michał Górny <mgorny@gentoo.org> (2018-06-13)
 # Requires app-arch/snappy[static-libs] that is no longer available.
@@ -428,7 +435,7 @@ app-emulation/fuse backend-svga
 # Patrick McLean <chutzpah@gentoo.org> (2018-03-06)
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2020-12-25)
 # Requires dev-libs/boost-1.72 that is gone
-sys-cluster/ceph system-boost
+<sys-cluster/ceph-15 system-boost
 
 # Brian Evans <grknight@gentoo.org> (2018-03-05)
 # Mask embedded USE on virtual/mysql and friends to transition it to be obsolete
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 525f6417906f..ede76eb9e08b 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Ben Kohler <bkohler@gentoo.org> (2021-11-27)
+# net-misc/pyhoca-cli and several of its deps will need stable first
+net-misc/remmina x2go
+
 # Sergey Popov <pinkbyte@gentoo.org> (2021-10-14)
 # net-libs/grpc is not yet stabilized,
 # so mask optional use flag on net-misc/frr
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b08b6b8e6109..d5ff47743a6e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,10 +4,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Brian Evans <grknight@gentoo.org> (2021-09-26)
-# Mask 8.1 as it is RC
-php_targets_php8-1
-
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 07b55fe4e694..453037208983 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Brian Evans <grknight@gentoo.org> (2021-11-29)
+# Mask 8.1 as it is currently unstable only
+php_targets_php8-1
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs