diff options
author | 2024-08-18 18:03:53 +0000 | |
---|---|---|
committer | 2024-08-18 18:03:53 +0000 | |
commit | d2c734327ca23daae49524b6d108d157a735cce6 (patch) | |
tree | 2b1d215a90af86effe9094852d714af33176f1c4 /profiles | |
parent | 2024-08-18 17:38:13 UTC (diff) | |
parent | app-vim/vimtex: add 2.15 (diff) | |
download | gentoo-d2c734327ca23daae49524b6d108d157a735cce6.tar.gz gentoo-d2c734327ca23daae49524b6d108d157a735cce6.tar.bz2 gentoo-d2c734327ca23daae49524b6d108d157a735cce6.zip |
Merge updates from master
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/base/make.defaults | 8 | ||||
-rw-r--r-- | profiles/desc/guile_single_target.desc | 7 | ||||
-rw-r--r-- | profiles/desc/guile_targets.desc | 7 | ||||
-rw-r--r-- | profiles/package.mask | 12 |
4 files changed, 33 insertions, 1 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 957af187bda2..302010846cdc 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -12,7 +12,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL CURL_QUIC ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL CURL_QUIC ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS GUILE_SINGLE_TARGET GUILE_TARGETS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. @@ -182,3 +182,9 @@ LUA_TARGETS="lua5-1" # we care about should match these anyway. See https://wiki.gentoo.org/wiki/Modern_C_porting. ac_cv_c_undeclared_builtin_options="none needed" gl_cv_compiler_check_decl_option="-Werror=implicit-function-declaration" + +# Arsen Arsenović <arsen@gentoo.org> (2024-08-04) +# Default target values for the Guile ecosystem (see also: +# guile{,-single}.eclass) +GUILE_TARGETS="3-0" +GUILE_SINGLE_TARGET="3-0" diff --git a/profiles/desc/guile_single_target.desc b/profiles/desc/guile_single_target.desc new file mode 100644 index 000000000000..95f51d5f0062 --- /dev/null +++ b/profiles/desc/guile_single_target.desc @@ -0,0 +1,7 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of GUILE_SINGLE_TARGET USE_EXPAND flags. + +2-2 - Build only for GNU Guile 2.2. +3-0 - Build only for GNU Guile 3.0. diff --git a/profiles/desc/guile_targets.desc b/profiles/desc/guile_targets.desc new file mode 100644 index 000000000000..a958e0c93334 --- /dev/null +++ b/profiles/desc/guile_targets.desc @@ -0,0 +1,7 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of GUILE_TARGETS USE_EXPAND flags. + +2-2 - Build only for GNU Guile 2.2 +3-0 - Build only for GNU Guile 3.0 diff --git a/profiles/package.mask b/profiles/package.mask index 3232315d3ede..300e0b820c56 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,18 @@ #--- END OF EXAMPLES --- +# Arsen Arsenović <arsen@gentoo.org> (2024-08-02) +# Guile rework masks. Mask all packages or package versions that are +# being bumped as part of the Guile reslotting process. +# Masked until the whole Guile ecosystem is updated. +>=dev-scheme/slib-3.3.1-r100 +www-apps/haunt +dev-scheme/guile-commonmark +>=dev-scheme/guile-reader-0.6.3-r100 +dev-scheme/guile:2.2 +dev-scheme/guile:3.0 +>=dev-build/make-4.4.1-r100 + # Eli Schwartz <eschwartz@gentoo.org> (2024-08-15) # Abandoned upstream since 2011, unmaintained in gentoo since 2017. Tons of # patches, breaks again with GCC 14. Severe QA issues, automagic dependencies, |