From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 2 Feb 2022 01:39:05 +0000
Subject: gentoo resync : 02.02.2022

---
 profiles/base/make.defaults     |  2 +-
 profiles/base/package.use.force |  7 ++++++-
 profiles/base/package.use.mask  | 18 ++++++++++++++++--
 profiles/base/use.mask          |  5 +++++
 4 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'profiles/base')

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8b1a489be4ad..7c4cc85f1cbc 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -166,7 +166,7 @@ POSTGRES_TARGETS="postgres12 postgres13"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php7-3 php7-4"
+PHP_TARGETS="php7-4 php8-0"
 
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f84cb4c43393..b558db9e0e62 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,7 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (20222-01-08
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-01-13)
+# Force to use installed openjdk{,-bin} for bootstrapping
+dev-java/openjdk:11 system-bootstrap
+dev-java/openjdk:17 system-bootstrap
+
+# Joonas Niilola <juippis@gentoo.org> (2022-01-08)
 # -xft broken, investigate in bug #830777
 ~x11-misc/xscreensaver-6.02 xft
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 526fd89968f0..67d7c4ca7ca1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # New entries go on top.
@@ -6,10 +6,24 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2021-01-24)
+# USE=custom-cflags is _particularly_ dangerous on sys-libs/glibc and
+# can result in not just build-time failures for glibc itself, but
+# runtime crashes. The effect of using USE=custom-cflags globally in make.conf
+# isn't the same as it is for just glibc specifically.
+sys-libs/glibc custom-cflags
+
+# Sam James <sam@gentoo.org> (2022-01-23)
+# Java bindings are broken with OpenJDK 11+ and we're not
+# aware of any consumers. bug #713866
+# The bindings will be removed on 2022-02-23 due to their state
+# of disrepair.
+sys-libs/db java
+
 # Sam James <sam@gentoo.org> (2022-01-12)
 # Unmask PCH for now for GCC to avoid unnecessary rebuilds
 # (USE=pch is now use.mask-ed globally)
-<sys-devel/gcc-11.3:11 -pch
+<sys-devel/gcc-11.2.1_p20220115:11 -pch
 <sys-devel/gcc-10.4:10 -pch
 =sys-devel/gcc-9* -pch
 =sys-devel/gcc-8* -pch
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index c6a22bb1577f..982071c4ee63 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-01-22)
+# Prelink support is being removed from glibc, and has been
+# somewhat broken for a while already
+prelink
+
 # Sam James <sam@gentoo.org> (2022-01-12)
 # PCH has proven itself to be unreliable and lead to spurious build
 # failures. Masking so users aren't exposed to such failures without opting-in.
-- 
cgit v1.2.3