diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
| commit | d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch) | |
| tree | b28b6cb077ae6b2457e30d49028fc978d8e2b59b /profiles/base | |
| parent | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff) | |
| parent | 6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff) | |
Merge branch 'next'
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/make.defaults | 4 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 | ||||
| -rw-r--r-- | profiles/base/use.stable.mask | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 298897cef62c..2eeffdf3ff59 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 74ca2ddea0b2..83f2781aa51a 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,6 +7,10 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michał Górny <mgorny@gentoo.org> (2019-09-08) +# LLVM 5 is being removed. +~dev-ada/gps-2018 gnat_2017 + # Michał Górny <mgorny@gentoo.org> (2019-09-07) # media-libs/libnut is slated for removal. media-video/mplayer nut diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index bc7a936405e3..645eae301301 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -14,7 +14,3 @@ python_single_target_pypy3 # Hans de Graaff <graaff@gentoo.org> (2018-12-25) # Currently in testing and not ready to go stable yet. ruby_targets_ruby26 - -# Patrick Lauer <patrick@gentoo.org> (2015-04-28) -# dependencies not stable yet -ayatana |