Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/
Date: Sat, 25 Jan 2020 16:23:28
Message-Id: 1579969398.e4cd35d2367ee58a45e11c112924b7cf1a0b3f84.zlogene@gentoo
1 commit: e4cd35d2367ee58a45e11c112924b7cf1a0b3f84
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 25 16:22:29 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 25 16:23:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cd35d2
7
8 profiles: kill NETBEANS vars
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 profiles/base/make.defaults | 6 +-----
13 profiles/desc/netbeans_modules.desc | 20 --------------------
14 profiles/embedded/make.defaults | 2 +-
15 3 files changed, 2 insertions(+), 26 deletions(-)
16
17 diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
18 index b4b872168f1..ff1f29d296b 100644
19 --- a/profiles/base/make.defaults
20 +++ b/profiles/base/make.defaults
21 @@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
22
23 # Env vars to expand into USE vars. Modifying this requires prior
24 # discussion on gentoo-dev@l.g.o.
25 -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"
26 +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 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"
27
28 # USE_EXPAND variables whose contents are not shown in package manager
29 # output. Changes need discussion on gentoo-dev.
30 @@ -96,10 +96,6 @@ XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface ge
31 # Some common lcd devices
32 LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"
33
34 -# Miroslav Šulc <fordfrog@g.o> (2008-11-19)
35 -# Netbeans modules/clusters
36 -NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
37 -
38 # Manuel Rüger <mrueg@g.o> (2015-09-09)
39 # Default Ruby build target(s)
40 # Updated to include ruby24 on 2018-11-12
41
42 diff --git a/profiles/desc/netbeans_modules.desc b/profiles/desc/netbeans_modules.desc
43 deleted file mode 100644
44 index 19c8f26d8f9..00000000000
45 --- a/profiles/desc/netbeans_modules.desc
46 +++ /dev/null
47 @@ -1,20 +0,0 @@
48 -# Copyright 2008 Gentoo Foundation.
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -# This file contains descriptions of NETBEANS_MODULES USE_EXPAND flags.
52 -
53 -apisupport - enables apisupport module
54 -cnd - enables C/C++ development support
55 -dlight - enables framework for creation of Observability Tools using DTrace
56 -enterprise - enables enterprise development support
57 -ergonomics - enables ergonomics features
58 -extide - enables extide module
59 -groovy - enables Groovy and Grails development support
60 -java - enables Java development support
61 -javacard - enables cluster for JavaCard development
62 -javafx - enables JavaFX development support
63 -mobility - enables support for development of mobile applications
64 -php - enables PHP development support
65 -profiler - enables Java profiler
66 -webcommon - enables javascript libraries and web client tools
67 -websvccommon - enables common support for web services development
68
69 diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
70 index 48f05441c1c..13b351460be 100644
71 --- a/profiles/embedded/make.defaults
72 +++ b/profiles/embedded/make.defaults
73 @@ -30,7 +30,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
74
75 # Env vars to expand into USE vars. Modifying this requires prior
76 # discussion on gentoo-dev@l.g.o.
77 -USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 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"
78 +USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 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 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"
79
80 # USE_EXPAND variables whose contents are not shown in package manager
81 # output. Changes need discussion on gentoo-dev.