[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     70735798382a67c24db9f9ede0157bc4c56d2b24
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 16:08:07 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 23:05:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70735798

profiles: Copy releases/17.0 to releases/23.0 (effectively empty now)

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/eapi                    | 1 +
 profiles/releases/23.0/make.defaults           | 2 ++
 profiles/releases/23.0/package.use.force       | 2 ++
 profiles/releases/23.0/package.use.mask        | 2 ++
 profiles/releases/23.0/package.use.stable.mask | 2 ++
 profiles/releases/23.0/parent                  | 1 +
 6 files changed, 10 insertions(+)

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..fb7bef2767c1
--- /dev/null
+++ b/profiles/releases/23.0/make.defaults
@@ -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.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 @@
+..

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     19a28412bab445e6c35db9fd14702efbbef22c74
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 23:20:24 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 23:21:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a28412

profiles: drop USE="cli dri" in 23.0

Bug: https://bugs.gentoo.org/831045
Bug: https://bugs.gentoo.org/849875
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index fb7bef2767c1..fef59f9d407f 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -1,2 +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"

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     99a7cb9e0b1728ca75242ddfee6357dc008bd1cd
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 18:26:40 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 18:27:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a7cb9e

profiles: Set USE="xz zstd" in 23.0

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index fef59f9d407f..b6e766a3483b 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -1,6 +1,9 @@
 # Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# This just makes sense nowadays, if only for distfiles...
+USE="xz zstd"
+
 # bug 831045
 USE="${USE} -cli"
 

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Sam James]

commit:     b327f3dd3476502e30f395326dc2cf3e050e8ed3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 00:02:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 00:02:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b327f3dd

profiles/releases/23.0: fix xz -> lzma typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index b6e766a3483b..7cd1e30dc0a3 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This just makes sense nowadays, if only for distfiles...
-USE="xz zstd"
+USE="lzma zstd"
 
 # bug 831045
 USE="${USE} -cli"

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     b8f85ec040954e05143e83c1495021bfd340cad7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 23:58:59 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 00:00:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f85ec0

profiles, 23.0: force new gcc useflags default-znow and default-stack-clash-protection

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/package.use.force | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force
index fb7bef2767c1..d103d0a4aab8 100644
--- a/profiles/releases/23.0/package.use.force
+++ b/profiles/releases/23.0/package.use.force
@@ -1,2 +1,4 @@
 # Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+>sys-devel/gcc-12.99 default-znow default-stack-clash-protection

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Sam James]

commit:     1526a7762c372596b440efd23f14276d7117aa98
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 02:10:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 02:10:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1526a776

profiles/releases/23.0: update copyright lines

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/releases/23.0/package.use.force       | 2 +-
 profiles/releases/23.0/package.use.stable.mask | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force
index d103d0a4aab8..a424f26e6193 100644
--- a/profiles/releases/23.0/package.use.force
+++ b/profiles/releases/23.0/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 >sys-devel/gcc-12.99 default-znow default-stack-clash-protection

diff --git a/profiles/releases/23.0/package.use.stable.mask b/profiles/releases/23.0/package.use.stable.mask
index fb7bef2767c1..65c385e7abde 100644
--- a/profiles/releases/23.0/package.use.stable.mask
+++ b/profiles/releases/23.0/package.use.stable.mask
@@ -1,2 +1,2 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     976d99bbae56b573f3dd0839a147e2359ba401f4
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 22:19:29 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 22:21:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976d99bb

profiles: 23.0 profile: make this more complete

* integrate merged-usr settings here, for use with split-usr feature
* add -Wl,-z,pack-relative-relocs

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults           | 12 ++++++++++++
 profiles/releases/23.0/package.use.force       |  4 ++--
 profiles/releases/23.0/package.use.mask        |  2 +-
 profiles/releases/23.0/package.use.stable.mask |  2 --
 profiles/releases/23.0/use.force               |  6 ++++++
 profiles/releases/23.0/use.mask                |  6 ++++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 7cd1e30dc0a3..c802f3fa3409 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -1,6 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# See also 
+# https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition
+
 # This just makes sense nowadays, if only for distfiles...
 USE="lzma zstd"
 
@@ -9,3 +12,12 @@ USE="${USE} -cli"
 
 # bug 849875
 USE="${USE} -dri"
+
+# bug 818376
+LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs"
+
+# copied from merged-usr feature
+# Mike Gilbert <floppym@gentoo.org> (2022-08-31)
+# Avoid removing merged-usr symlinks.
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"

diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force
index a424f26e6193..29a80fc588b8 100644
--- a/profiles/releases/23.0/package.use.force
+++ b/profiles/releases/23.0/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
->sys-devel/gcc-12.99 default-znow default-stack-clash-protection
+>=sys-devel/gcc-12.3 default-znow default-stack-clash-protection

diff --git a/profiles/releases/23.0/package.use.mask b/profiles/releases/23.0/package.use.mask
index adc292d4df13..7084783a52c6 100644
--- a/profiles/releases/23.0/package.use.mask
+++ b/profiles/releases/23.0/package.use.mask
@@ -1,2 +1,2 @@
-# Copyright 2017-2022 Gentoo Authors
+# Copyright 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
deleted file mode 100644
index 65c385e7abde..000000000000
--- a/profiles/releases/23.0/package.use.stable.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2

diff --git a/profiles/releases/23.0/use.force b/profiles/releases/23.0/use.force
new file mode 100644
index 000000000000..b04dc784e183
--- /dev/null
+++ b/profiles/releases/23.0/use.force
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (2022-08-30)
+# Un-force split-usr.
+-split-usr

diff --git a/profiles/releases/23.0/use.mask b/profiles/releases/23.0/use.mask
new file mode 100644
index 000000000000..4e6cb8ec4a37
--- /dev/null
+++ b/profiles/releases/23.0/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (2022-08-30)
+# Mask split-usr.
+split-usr

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     5eeccd7cd27c50e8297a30babc3a54ee0492ac4a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 22:48:04 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 22:48:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eeccd7c

profiles: add 23.0 package.mask

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/package.mask | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/profiles/releases/23.0/package.mask b/profiles/releases/23.0/package.mask
new file mode 100644
index 000000000000..206ab70bd19f
--- /dev/null
+++ b/profiles/releases/23.0/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# DT_RELR needs glibc-2.36
+<sys-libs/glibc-2.36

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     4460ea701c9f3ad6d4d24483106d0161620c43e8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 00:29:57 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 00:30:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4460ea70

profiles: update gcc version with new useflags in 23.0 profile

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/package.use.force | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/releases/23.0/package.use.force b/profiles/releases/23.0/package.use.force
index 29a80fc588b8..c1e6cb1e1d86 100644
--- a/profiles/releases/23.0/package.use.force
+++ b/profiles/releases/23.0/package.use.force
@@ -1,4 +1,4 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
->=sys-devel/gcc-12.3 default-znow default-stack-clash-protection
+>=sys-devel/gcc-12.2 default-znow default-stack-clash-protection

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     d919c3516a0bdf18c9b9a36a8b1ed50e63bfa286
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 14:16:34 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 14:16:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d919c351

profiles: 23.0 needs future musl release

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/package.mask | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/releases/23.0/package.mask b/profiles/releases/23.0/package.mask
index 206ab70bd19f..32696969517f 100644
--- a/profiles/releases/23.0/package.mask
+++ b/profiles/releases/23.0/package.mask
@@ -1,5 +1,6 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# DT_RELR needs glibc-2.36
+# DT_RELR needs glibc-2.36 or musl-1.2.4(?)
 <sys-libs/glibc-2.36
+<sys-libs/musl-1.2.4

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     28c08ce8457dbf5a9ac1a9a4cdf6265e7b20c4eb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 13:55:37 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 13:56:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c08ce8

profiles, 23.0: add zstd to BOOTSTRAP_USE

Needed since otherwise LLVM fails to install into stage1 on llvm profiles

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 67fcf7e034d8..16ffd78fb52d 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -21,3 +21,6 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 # Avoid removing merged-usr symlinks.
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"
+
+# needed for llvm profiles
+BOOTSTRAP_USE="${BOOTSTRAP_USE} zstd"

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Ionen Wolkens]

commit:     6522bf905272ffb0b4df763f09dd944069858c09
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 11:56:01 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 12:11:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6522bf90

profiles/releases/23.0/package.use: re-enable USE=cli on mpv

Already default in the ebuild, but the profile's USE="-cli" causes
that to be overridden.

Hoping that this is a temporary workaround and there is a better way
to handle this in the profile, pretty sure the idea was to no longer
enable cli by default, not disable by default.

Bug: https://bugs.gentoo.org/925520
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 profiles/releases/23.0/package.use | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
new file mode 100644
index 000000000000..f25938b2f986
--- /dev/null
+++ b/profiles/releases/23.0/package.use
@@ -0,0 +1,6 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2024-02-28)
+# 23.0 profiles have USE="-cli" overriding ebuild's IUSE="+cli" (bug #925520)
+media-video/mpv cli

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     6d50b94b230150f0c380ecd6d596248fe5a7f2fb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 08:51:37 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 08:53:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d50b94b

profiles: Re-enable openmp in 23.0 profiles again, step 1: gcc-only

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 4 ++++
 profiles/releases/23.0/package.use   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 16ffd78fb52d..b833954ae2f8 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -7,6 +7,10 @@
 # This just makes sense nowadays, if only for distfiles...
 USE="lzma zstd"
 
+## make sure toolchain has sane defaults <toolchain@gentoo.org>
+# (re-enable after one round of stage rebuilds)
+#USE="${USE} openmp"
+
 # bug 831045
 USE="${USE} -cli"
 

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
index f25938b2f986..8e91c6db09c1 100644
--- a/profiles/releases/23.0/package.use
+++ b/profiles/releases/23.0/package.use
@@ -4,3 +4,7 @@
 # Ionen Wolkens <ionen@gentoo.org> (2024-02-28)
 # 23.0 profiles have USE="-cli" overriding ebuild's IUSE="+cli" (bug #925520)
 media-video/mpv cli
+
+# temporarily here, until one round of stage rebuilds is done and we can
+# default-enable it globally again
+sys-devel/gcc openmp

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     b3f0d2b61f770ada1cf16bab5da16923f1a2f7ca
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 12:44:45 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 12:45:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f0d2b6

profiles, 23.0: un-break initial baselayout installation in stage1

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
index 258d9754e5bb..1a09f04d4d3a 100644
--- a/profiles/releases/23.0/profile.bashrc
+++ b/profiles/releases/23.0/profile.bashrc
@@ -1,4 +1,4 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ "${CATEGORY}/${PN}" != "sys-apps/baselayout" ]] ; then
 	if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
 		eerror ""
 		eerror "Your profile is of type merged-usr, but your directories"

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     6d67d9ebd6fe9d7ef6c962d27349d23631f5fb0b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 14:40:18 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 14:40:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d67d9eb

profiles: 23.0: improve safety rail condition split vs merged

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
index 1a09f04d4d3a..6c178b086158 100644
--- a/profiles/releases/23.0/profile.bashrc
+++ b/profiles/releases/23.0/profile.bashrc
@@ -1,4 +1,4 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ "${CATEGORY}/${PN}" != "sys-apps/baselayout" ]] ; then
+if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
 	if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
 		eerror ""
 		eerror "Your profile is of type merged-usr, but your directories"

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     c09d005ee2ecb2af608172bc615ecfa3af184582
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 21:14:23 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 21:15:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09d005e

profiles: default-enable openmp in 23.0 again, it's very much in use

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults | 5 ++---
 profiles/releases/23.0/package.use   | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index b833954ae2f8..7d96215e456e 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -7,9 +7,8 @@
 # This just makes sense nowadays, if only for distfiles...
 USE="lzma zstd"
 
-## make sure toolchain has sane defaults <toolchain@gentoo.org>
-# (re-enable after one round of stage rebuilds)
-#USE="${USE} openmp"
+# make sure toolchain has sane defaults <toolchain@gentoo.org>
+USE="${USE} openmp"
 
 # bug 831045
 USE="${USE} -cli"

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
index 8e91c6db09c1..f25938b2f986 100644
--- a/profiles/releases/23.0/package.use
+++ b/profiles/releases/23.0/package.use
@@ -4,7 +4,3 @@
 # Ionen Wolkens <ionen@gentoo.org> (2024-02-28)
 # 23.0 profiles have USE="-cli" overriding ebuild's IUSE="+cli" (bug #925520)
 media-video/mpv cli
-
-# temporarily here, until one round of stage rebuilds is done and we can
-# default-enable it globally again
-sys-devel/gcc openmp

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Ionen Wolkens]

commit:     3e2b1d5908495e663273ad1e4c402979ae00ec63
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 11:11:35 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 11:13:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2b1d59

profiles/releases/23.0: cleanup obsolete mpv USE=cli workaround

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 profiles/releases/23.0/package.use | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
deleted file mode 100644
index f25938b2f986..000000000000
--- a/profiles/releases/23.0/package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ionen Wolkens <ionen@gentoo.org> (2024-02-28)
-# 23.0 profiles have USE="-cli" overriding ebuild's IUSE="+cli" (bug #925520)
-media-video/mpv cli

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     43f01d356a8fd347a19d7583eab92d01bee35f9f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:11:09 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:27:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f01d35

profiles: releases/23.0: Fix bashrc safety guard

The previous version relied on an environment variable, which was
*not* saved in binary packages and also not re-sourced from the
profile. It always became unset, which meant "merged-usr".

With that, not the local profile and the local filesystem were
compared, but "merged-usr" and the local filesystem -- which
obviously fails for any split-usr installation.

Closes: https://bugs.gentoo.org/927631
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/profile.bashrc | 43 ++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
index 6c178b086158..ae82a4b3216e 100644
--- a/profiles/releases/23.0/profile.bashrc
+++ b/profiles/releases/23.0/profile.bashrc
@@ -1,5 +1,40 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
-	if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
+
+__gentoo_get_disk_splitmerge() {
+	# does /bin exist? important for baselayout
+	if [[ -e "${EROOT%/}/bin" ]] ; then
+		# is /bin a symlink?
+		if [[ -h "${EROOT%/}/bin" ]] ; then
+			echo -n merged
+		else
+			echo -n split
+		fi
+	else
+		echo -n unknown
+	fi
+}
+
+__gentoo_get_profile_splitmerge() {
+	# does /etc/portage/make.profile exist and is a symlink?
+	if [[ -h "${EROOT%/}/etc/portage/make.profile" ]] ; then
+		local linktarget=$(readlink "${EROOT%/}/etc/portage/make.profile")
+
+		# 23.0 profile?
+		if [[ "${linktarget}" == */23.0* ]] ; then
+			if [[ "${linktarget}" == *split-usr* ]] ; then
+				echo -n split
+			else
+				echo -n merged
+			fi
+		else
+			echo -n unknown
+		fi
+	else
+		echo -n unknown
+	fi
+}
+
+if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+	if [[ $(__gentoo_get_disk_splitmerge) == "split" ]] && [[ $(__gentoo_get_profile_splitmerge) == "merged" ]] ; then
 		eerror ""
 		eerror "Your profile is of type merged-usr, but your directories"
 		eerror "on-disk are of type split-usr."
@@ -8,7 +43,7 @@ if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
 		eerror ""
 		die "ERROR: 23.0 merged-usr profile, but disk is split-usr"
 	fi
-	if [[ -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" == "split-usr" ]] ; then
+	if [[ $(__gentoo_get_disk_splitmerge) == "merged" ]] && [[ $(__gentoo_get_profile_splitmerge) == "split" ]] ; then
 		eerror ""
 		eerror "Your profile is of type split-usr, but your directories"
 		eerror "on-disk are of type merged-usr."
@@ -18,3 +53,5 @@ if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
 		die "ERROR: 23.0 split-usr profile, but disk is merged-usr"
 	fi
 fi
+
+unset -f __gentoo_get_disk_splitmerge __gentoo_get_profile_splitmerge

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Andreas K. Hüttel]

commit:     bbe2b57efbc894c3a06c283927ae245d0d1b6454
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  9 21:44:36 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 21:48:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe2b57e

profiles, 23.0: Undo USE="lzma zstd", except for toolchain where zstd makes sense

As discussed on gentoo-dev and in toolchain / base-system teams.

Closes: https://bugs.gentoo.org/928932
Closes: https://bugs.gentoo.org/928933
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/make.defaults |  9 +++------
 profiles/releases/23.0/package.use   | 10 ++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 9680364430cf..ddff032c125c 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -1,14 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See also 
 # https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition
 
-# This just makes sense nowadays, if only for distfiles...
-USE="lzma zstd"
-
 # make sure toolchain has sane defaults <toolchain@gentoo.org>
-USE="${USE} openmp"
+USE="openmp"
 
 # bug 818376 (only on specific arches)
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
@@ -19,5 +16,5 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"
 
-# needed for llvm profiles
+# needed for llvm profiles, we may want to solve this in releng.git instead
 BOOTSTRAP_USE="${BOOTSTRAP_USE} zstd"

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
new file mode 100644
index 000000000000..2c78142ab564
--- /dev/null
+++ b/profiles/releases/23.0/package.use
@@ -0,0 +1,10 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-04-10)
+# We want the toolchain to use zstd compression for LTO objects and
+# debug information
+#
+sys-devel/gcc zstd
+sys-devel/binutils zstd
+sys-devel/llvm zstd

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/

[Sam James]

commit:     5d43599359d124a9e4c7f2c9c575883d13b386dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  9 22:34:22 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 22:34:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d435993

profiles/releases/23.0: enable zstd for sys-devel/lld too

It has to match LLVM or we get autounmask hell.

Bug: https://bugs.gentoo.org/928933
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/releases/23.0/package.use | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
index 2c78142ab564..c7d461f9ed5d 100644
--- a/profiles/releases/23.0/package.use
+++ b/profiles/releases/23.0/package.use
@@ -8,3 +8,4 @@
 sys-devel/gcc zstd
 sys-devel/binutils zstd
 sys-devel/llvm zstd
+sys-devel/lld zstd