commit: b29bdf91eff134ec14e92b3824961fc84a04940d Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Mar 22 19:34:05 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Mar 22 19:36:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29bdf91
profiles: Move default-on of USE=cli to 17.0 directory, so it can be "unset" in 23.0 This way the default can be overridden by in-ebuild use defaults. Bug: https://bugs.gentoo.org/831045 Bug: https://bugs.gentoo.org/925520 Closes: https://bugs.gentoo.org/927217 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> profiles/default/linux/make.defaults | 5 ++++- profiles/releases/17.0/make.defaults | 3 ++- profiles/releases/23.0/make.defaults | 3 --- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults index 4e21cd58fdf2..a1342b438891 100644 --- a/profiles/default/linux/make.defaults +++ b/profiles/default/linux/make.defaults @@ -20,7 +20,10 @@ USE="${USE} seccomp" # These USE flags were originally inserted here because of PHP # and were later removed by me. Reinserting the USE flags again because they are # global USE flags that may be expected to be set by other packages. -USE="${USE} cli pcre" +# Andreas K. Hüttel <dilfri...@gentoo.org> (2024-03-22) +# Moving cli to 17.0, so it can be unset in 23.0 and this way overridden by +# use defaults... +USE="${USE} pcre" # Donnie Berkholz <dberkh...@gentoo.org> (2006-03-07) # Modular X: Support direct rendering by default diff --git a/profiles/releases/17.0/make.defaults b/profiles/releases/17.0/make.defaults index f2e63d883298..b64025222418 100644 --- a/profiles/releases/17.0/make.defaults +++ b/profiles/releases/17.0/make.defaults @@ -2,4 +2,5 @@ # Distributed under the terms of the GNU General Public License v2 # make sure toolchain has sane defaults <toolch...@gentoo.org> -USE="${USE} fortran openmp" +# move cli here from default/linux +USE="${USE} cli fortran openmp" diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults index 7d96215e456e..1e73a1f8de78 100644 --- a/profiles/releases/23.0/make.defaults +++ b/profiles/releases/23.0/make.defaults @@ -10,9 +10,6 @@ USE="lzma zstd" # make sure toolchain has sane defaults <toolch...@gentoo.org> USE="${USE} openmp" -# bug 831045 -USE="${USE} -cli" - # bug 849875 USE="${USE} -dri"
