commit: 89b6e0a3442972aaf1bf89eab004f19fbfb85bb6 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat Mar 27 11:48:20 2021 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Mon Mar 29 12:42:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b6e0a3
profiles: add masks for arch-specific sci-mathematics/maxima flags. Now that there are two separate flags (clozurecl and clozurecl64) for the corresponding 32-bit and 64-bit lisp implementations in maxima, we need to refactor the profile masks a bit. The idea is that, going forward, 32-bit arches will unmask "clozurecl" and 64-bit arches will unmask "clozurecl64" for maxima. This only gets a bit messy because we still need to support older versions of maxima where the flags are NOT split; and we have one other package (sci-mathematics/fricas) which treats USE=clozurecl generically. Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> profiles/arch/amd64/package.use.mask | 8 ++++++++ profiles/arch/amd64/use.mask | 1 - profiles/arch/base/package.use.mask | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 33fc0e6531a..d948cdc183b 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,14 @@ #--- END OF EXAMPLES --- +# Michael Orlitzky <m...@gentoo.org> (2021-03-27) +# Unmask the use of 64-bit dev-lisp/clozurecl on 64-bit arches. +# Only maxima makes a distinction between the 32-bit and 64-bit +# USE flags. +sci-mathematics/fricas -clozurecl +<sci-mathematics/maxima-5.44.0-r5 -clozurecl +sci-mathematics/maxima -clozurecl64 + # Thomas Deutschmann <whi...@gentoo.org> (2021-02-17) # Unmask PCRE JIT support where dev-libs/libpcre2[jit] is available dev-lang/php -jit diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index 30c8a9b4114..b5cba9077af 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -55,7 +55,6 @@ # Andrey Grozin <gro...@gentoo.org> (2014-06-25) # keyworded on amd64 -clisp --clozurecl -ecls -gcl -sbcl diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 542e10c3fa5..883c1d48b80 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michael Orlitzky <m...@gentoo.org> (2021-03-27) +# The clozurecl and clozurecl64 flags are now arch-specific in maxima, +# so we mask them both by default beginning with v5.44.0-r5 where +# their meanings first diverged. You should unmask "clozurecl" on +# 32-bit arches and unmask "clozurecl64" on 64-bit ones. +# We don't list "clozurecl" here since it's already in use.mask. +>=sci-mathematics/maxima-5.44.0-r5 clozurecl64 + # Sam James <s...@gentoo.org> (2021-03-02) # Java build is extremely sensitive to environment # Previously stable-masked but moved here
