1 |
commit: 2dbbacd4e244b98177733af225112bc0f1690837 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 27 17:49:37 2017 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 5 15:38:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbbacd4 |
7 |
|
8 |
profiles: Remove LINGUAS from USE_EXPAND |
9 |
|
10 |
Apply the long-overdue removal of LINGUAS from USE_EXPAND. Per the PMS |
11 |
rules, specifying it as a USE_EXPAND implicitly filters any values that |
12 |
are not present in IUSE. This effectively means that ebuilds |
13 |
not specifying linguas_* flags at all should get empty exported LINGUAS |
14 |
variable. As a result, those packages would not install localizations |
15 |
at all. |
16 |
|
17 |
To avoid this unfortunate behavior, remove LINGUAS from USE_EXPAND. |
18 |
The LINGUAS variable becomes a regular environment variable that |
19 |
implicitly controls package builds. Ebuilds still using linguas* in IUSE |
20 |
may experience a mismatch between the value of LINGUAS (if any) |
21 |
and the flag states; however, it should not cause any major |
22 |
inconvenience. |
23 |
|
24 |
profiles/base/make.defaults | 2 +- |
25 |
profiles/embedded/make.defaults | 2 +- |
26 |
2 files changed, 2 insertions(+), 2 deletions(-) |
27 |
|
28 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
29 |
index 8139749349d..95b8d6516ba 100644 |
30 |
--- a/profiles/base/make.defaults |
31 |
+++ b/profiles/base/make.defaults |
32 |
@@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" |
33 |
|
34 |
# Env vars to expand into USE vars. Modifying this requires prior |
35 |
# discussion on gentoo-dev@l.g.o. |
36 |
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS 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" |
37 |
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS 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" |
38 |
|
39 |
# USE_EXPAND variables whose contents are not shown in package manager |
40 |
# output. Changes need discussion on gentoo-dev. |
41 |
|
42 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
43 |
index 1145142fe4a..911c7037f5d 100644 |
44 |
--- a/profiles/embedded/make.defaults |
45 |
+++ b/profiles/embedded/make.defaults |
46 |
@@ -27,7 +27,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" |
47 |
|
48 |
# Env vars to expand into USE vars. Modifying this requires prior |
49 |
# discussion on gentoo-dev@l.g.o. |
50 |
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS 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" |
51 |
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS 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" |
52 |
|
53 |
# USE_EXPAND variables whose contents are not shown in package manager |
54 |
# output. Changes need discussion on gentoo-dev. |