gentoo auto-resync : 13:11:2022 - 12:48:53

15 files changed, 36 insertions, 22 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9dfd20116ffb..2fc914fc0e2b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 39d5dd1cf8aa..1117b529b3dd 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -104,6 +104,12 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Updated to include ruby27 on 2021-10-10
 RUBY_TARGETS="ruby27"
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-10-22)
+# These USE flags are what is common between the various sub-profiles. Stages 2
+# and 3 are built against these, so be careful what you add.
+# Moved here from releases/
+USE="acl bzip2 gdbm nptl unicode"
+
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
 USE="${USE} xattr"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 76b5768c656b..f423a411ebe4 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -142,6 +142,11 @@ media-sound/lilypond guile2
 # to have a compiler not capable of C++, bug #692126.
 sys-devel/gcc cxx
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
+# Force default-PIE build on 17.0 profiles and later.
+# Moved here from releases/17.0 (2022-10-22)
+sys-devel/gcc pie
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-04-14)
 # Make sure glibc static libs are installed for now. Not installing
 # them is an experimental feature and needs testing.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 389658bab392..3a3c6d81ae61 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -638,10 +638,6 @@ sci-libs/linux-gpib php
 # Mask ruby20-only compatible packages
 ~media-libs/libcaca-0.99_beta19 ruby
 
-# Matthias Maier <tamiko@gentoo.org> (2017-05-11)
-# Globally mask pie use flag. Selectively unmask on specific profiles.
-sys-devel/gcc pie
-
 # Mike Gilbert <floppym@gentoo.org> (2017-02-16)
 # Multiple test failures.
 sys-boot/grub:2 test
diff --git a/profiles/package.mask b/profiles/package.mask
index 6999a9863451..2047743e7426 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Matthew Smith <matthew@gentoo.org> (2022-11-13)
+# Please update to Erlang/OTP 25. Removal in 30 days.
+# Bug #864543
+<dev-lang/erlang-25
+<net-misc/rabbitmq-server-3.11.0
+
 # Ionen Wolkens <ionen@gentoo.org> (2022-11-11)
 # Had a handful of reports of unbootable systems with this new version.
 # Given it's a still-experimental new branch, mask for now in case.
diff --git a/profiles/releases/17.0/make.defaults b/profiles/releases/17.0/make.defaults
index 475e60c7d655..fb7bef2767c1 100644
--- a/profiles/releases/17.0/make.defaults
+++ b/profiles/releases/17.0/make.defaults
@@ -1,5 +1,2 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Adding this one, since it makes sense.
-USE="bzip2"
diff --git a/profiles/releases/17.0/package.use.force b/profiles/releases/17.0/package.use.force
index 93c1097058f0..fb7bef2767c1 100644
--- a/profiles/releases/17.0/package.use.force
+++ b/profiles/releases/17.0/package.use.force
@@ -1,6 +1,2 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
-# Force default-PIE build on 17.0 profiles.
-sys-devel/gcc pie
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index e43c3f628a84..adc292d4df13 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -1,6 +1,2 @@
 # Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
-# Unmask default-PIE on 17.0 profiles.
-sys-devel/gcc -pie
diff --git a/profiles/releases/23.0/eapi b/profiles/releases/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/releases/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
new file mode 100644
index 000000000000..fef59f9d407f
--- /dev/null
+++ b/profiles/releases/23.0/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# bug 831045
+USE="${USE} -cli"
+
+# bug 849875
+USE="${USE} -dri"
diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force
new file mode 100644
index 000000000000..fb7bef2767c1
--- /dev/null
+++ b/profiles/releases/23.0/package.use.force
@@ -0,0 +1,2 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/releases/23.0/package.use.mask b/profiles/releases/23.0/package.use.mask
new file mode 100644
index 000000000000..adc292d4df13
--- /dev/null
+++ b/profiles/releases/23.0/package.use.mask
@@ -0,0 +1,2 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/releases/23.0/package.use.stable.mask b/profiles/releases/23.0/package.use.stable.mask
new file mode 100644
index 000000000000..fb7bef2767c1
--- /dev/null
+++ b/profiles/releases/23.0/package.use.stable.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/releases/23.0/parent b/profiles/releases/23.0/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/releases/23.0/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/releases/make.defaults b/profiles/releases/make.defaults
index a0a37cc33d79..fb7bef2767c1 100644
--- a/profiles/releases/make.defaults
+++ b/profiles/releases/make.defaults
@@ -1,6 +1,2 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# These USE flags are what is common between the various sub-profiles. Stages 2
-# and 3 are built against these, so be careful what you add.
-USE="acl gdbm nptl unicode"