commit:     ce972e62391302a9453159a075412118908d7ce7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 19:40:34 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 19:40:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce972e62

profiles: Move default-on of USE=dri 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/849875
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/default/linux/make.defaults | 6 ------
 profiles/releases/17.0/make.defaults | 4 ++--
 profiles/releases/23.0/make.defaults | 3 ---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/profiles/default/linux/make.defaults 
b/profiles/default/linux/make.defaults
index a1342b438891..12dd86f25c53 100644
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -25,12 +25,6 @@ USE="${USE} seccomp"
 # use defaults...
 USE="${USE} pcre"
 
-# Donnie Berkholz <dberkh...@gentoo.org> (2006-03-07)
-# Modular X: Support direct rendering by default
-# Andreas K. Huettel <dilfri...@gentoo.org> (2013-01-21)
-# Re-added following discussion with chithead
-USE="${USE} dri"
-
 # Luca Barbato <lu_z...@gentoo.org> (2006-10-28)
 # on glibc system you cannot turn it off
 USE="${USE} iconv"

diff --git a/profiles/releases/17.0/make.defaults 
b/profiles/releases/17.0/make.defaults
index b64025222418..033d62626f91 100644
--- a/profiles/releases/17.0/make.defaults
+++ b/profiles/releases/17.0/make.defaults
@@ -2,5 +2,5 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # make sure toolchain has sane defaults <toolch...@gentoo.org>
-# move cli here from default/linux
-USE="${USE} cli fortran openmp"
+# move cli and dri here from default/linux
+USE="${USE} cli dri fortran openmp"

diff --git a/profiles/releases/23.0/make.defaults 
b/profiles/releases/23.0/make.defaults
index 1e73a1f8de78..9680364430cf 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 849875
-USE="${USE} -dri"
-
 # bug 818376 (only on specific arches)
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 

Reply via email to