[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/

[Sergei Trofimovich]

commit:     8dd32dc8bd87b6a3a886f3bec1b3bb5f91002d2e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 18:52:22 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 19:39:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd32dc8

profiles: drop CROSSCOMPILE_OPTS USE_EXPAND, bug #642712

Closes: https://bugs.gentoo.org/642712
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 profiles/base/make.defaults          | 4 ++--
 profiles/desc/crosscompile_opts.desc | 8 --------
 profiles/embedded/make.defaults      | 4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 95b8d6516ba..493af9ce75d 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_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"
+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 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 CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"

diff --git a/profiles/desc/crosscompile_opts.desc b/profiles/desc/crosscompile_opts.desc
deleted file mode 100644
index 1923d8b13e8..00000000000
--- a/profiles/desc/crosscompile_opts.desc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of CROSSCOMPILE_OPTS USE_EXPAND flags.
-
-# Keep it sorted.
-
-headers-only - Build the toolchain against cross-headers only.

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 911c7037f5d..793ae368917 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -27,11 +27,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_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"
+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 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 CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/

[David Seifert]

commit:     0349659edae44f43075ea37c44afdf8b5dfc843f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 11:02:27 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 11:02:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0349659e

profiles: remove dead kernel/elibc flags

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/base/make.defaults     |  4 ++--
 profiles/base/use.mask          | 12 ------------
 profiles/desc/elibc.desc        |  7 -------
 profiles/desc/kernel.desc       |  8 +-------
 profiles/embedded/make.defaults |  4 ++--
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 547c7b31e83c..6548a518da5e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -7,8 +7,8 @@
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
+USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt"
+USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 137f6707246c..eee41ca8c6f8 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -70,26 +70,14 @@ multilib
 # Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
 userland_BSD
 
-elibc_AIX
 elibc_bionic
 elibc_Cygwin
 elibc_Darwin
-elibc_DragonFly
-elibc_HPUX
-elibc_Interix
 elibc_musl
-elibc_NetBSD
-elibc_OpenBSD
 elibc_SunOS
 elibc_Winnt
 
-kernel_AIX
 kernel_Darwin
-kernel_FreeBSD
-kernel_freemint
-kernel_HPUX
-kernel_NetBSD
-kernel_OpenBSD
 kernel_SunOS
 kernel_Winnt
 

diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index ec994a00e657..8eef69979c83 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -4,18 +4,11 @@
 # This file contains descriptions of ELIBC USE_EXPAND flags.
 
 # Keep it sorted.
-
-AIX - ELIBC setting for systems that use the AIX C library
 bionic - ELIBC setting for systems that use Android's Bionic C library
 Cygwin - ELIBC setting for systems that use Cygwin
 Darwin - ELIBC setting for systems that use the Darwin C library
-DragonFly - ELIBC setting for systems that use the DragonFly C library
 glibc - ELIBC setting for systems that use the GNU C library
-HPUX - ELIBC setting for systems that use the HP-UX C library
-Interix - ELIBC setting for systems that use the Interix C library
 mingw - ELIBC setting for systems that use the Minimalist GNU for Windows library
 musl - ELIBC setting for systems that use the musl C library
-NetBSD - ELIBC setting for systems that use the NetBSD C library
-OpenBSD - ELIBC setting for systems that use the OpenBSD C library
 SunOS - ELIBC setting for systems that use the Sun Solaris C library
 Winnt - ELIBC setting for systems that use Winnt

diff --git a/profiles/desc/kernel.desc b/profiles/desc/kernel.desc
index 48d6e5455ea8..6658d525396b 100644
--- a/profiles/desc/kernel.desc
+++ b/profiles/desc/kernel.desc
@@ -1,16 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of KERNEL USE_EXPAND flags.
 
 # Keep it sorted.
-AIX - KERNEL setting for system using the AIX kernel
 Darwin - KERNEL setting for system using the Darwin kernel (i.e.: Mac OS X).
-FreeBSD - KERNEL setting for system using the FreeBSD kernel
-freemint - KERNEL setting for system using the FreeMiNT kernel
-HPUX - KERNEL setting for system using the HP-UX kernel
 linux - KERNEL setting for system using the Linux kernel
-NetBSD - KERNEL setting for system using the NetBSD kernel
-OpenBSD - KERNEL setting for system using the OpenBSD kernel
 SunOS - KERNEL setting for system using an SunOS (i.e.: Solaris) kernel
 Winnt - KERNEL setting for systems on Windows (Cygwin, MinGW, Winnt, ...)

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 4320f726a5e9..a86ce015b4d4 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -24,8 +24,8 @@ IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
+USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt"
+USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/

[Mikle Kolyada]

commit:     e4cd35d2367ee58a45e11c112924b7cf1a0b3f84
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 16:22:29 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 16:23:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cd35d2

profiles: kill NETBEANS vars

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 profiles/base/make.defaults         |  6 +-----
 profiles/desc/netbeans_modules.desc | 20 --------------------
 profiles/embedded/make.defaults     |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b4b872168f1..ff1f29d296b 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ 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_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="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"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -96,10 +96,6 @@ XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface ge
 # Some common lcd devices
 LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2008-11-19)
-# Netbeans modules/clusters
-NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
-
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
 # Updated to include ruby24 on 2018-11-12

diff --git a/profiles/desc/netbeans_modules.desc b/profiles/desc/netbeans_modules.desc
deleted file mode 100644
index 19c8f26d8f9..00000000000
--- a/profiles/desc/netbeans_modules.desc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of NETBEANS_MODULES USE_EXPAND flags.
-
-apisupport - enables apisupport module
-cnd - enables C/C++ development support
-dlight - enables framework for creation of Observability Tools using DTrace
-enterprise - enables enterprise development support
-ergonomics - enables ergonomics features
-extide - enables extide module
-groovy - enables Groovy and Grails development support
-java - enables Java development support
-javacard - enables cluster for JavaCard development
-javafx - enables JavaFX development support
-mobility - enables support for development of mobile applications
-php - enables PHP development support
-profiler - enables Java profiler
-webcommon - enables javascript libraries and web client tools
-websvccommon - enables common support for web services development

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 48f05441c1c..13b351460be 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -30,7 +30,7 @@ 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 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 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"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/

[Michał Górny]

commit:     f75ecfc4a925b3ee8a0157500aaaae1bd45bd348
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 17:32:04 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 26 17:38:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75ecfc4

profiles: Remove unused FOO2ZJS_DEVICES USE_EXPAND

 profiles/base/make.defaults        |  2 +-
 profiles/desc/foo2zjs_devices.desc | 52 --------------------------------------
 profiles/embedded/make.defaults    |  2 +-
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 939e448..f641e4a 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -16,7 +16,7 @@ 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_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES 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 PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES 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 PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.

diff --git a/profiles/desc/foo2zjs_devices.desc b/profiles/desc/foo2zjs_devices.desc
deleted file mode 100644
index 06bc63c..0000000
--- a/profiles/desc/foo2zjs_devices.desc
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# This file contains descriptions of FOO2ZJS_DEVICES USE_EXPAND flags.
-# created by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh
-
-# Keep it sorted.
-
-hp2600n - Get HP Color LaserJet 2600n .ICM files
-hp1600 - Get HP Color LaserJet 1600 .ICM files
-hp1500 - Get HP Color LaserJet 1500 .ICM files
-
-km2530 - Get Konica Minolta 2530 DL .ICM files
-km2490 - Get Konica Minolta 2490 MF .ICM files
-km2480 - Get Konica Minolta 2480 MF .ICM files
-xp6115 - Get Xerox Phaser 6115MFP .ICM files
-
-km2430 - Get Konica Minolta 2430 DL .ICM files
-km2300 - Get Minolta 2300 DL .ICM files
-km2200 - Get Minolta 2200 DL .ICM files
-kmcpwl - Get Minolta Color PageWorks/Pro L .ICM files
-
-sa300 - Get Samsung CLP-300 .ICM files
-sa315 - Get Samsung CLP-315 .ICM files
-sa2160 - Get Samsung CLX-2160 .ICM files
-sa3160 - Get Samsung CLX-3160 .ICM files
-xp6110 - Get Xerox Phaser 6110 and 6110MFP .ICM files
-
-lm500 - Get Lexmark C500 .ICM files
-
-oki3200 - Get Oki C3200 .ICM files
-oki3300 - Get Oki C3300 .ICM files
-oki3400 - Get Oki C3400 .ICM files
-oki3530 - Get Oki C3530 .ICM files
-oki5100 - Get Oki C5100 .ICM files
-oki5200 - Get Oki C5200 .ICM files
-oki5500 - Get Oki C5500 .ICM files
-oki5600 - Get Oki C5600 .ICM files
-oki5800 - Get Oki C5800 .ICM files
-
-hp1215 - Get HP LJ 1215 firmware file
-hp1020 - Get HP LJ 1020 firmware file
-hp1018 - Get HP LJ 1005 firmware file
-hp1005 - Get HP LJ 1005 firmware file
-hp1000 - Get HP LJ 1000 firmware file
-
-hpp1505 - Get HP LJ P1505 firmware file
-hpp1008 - Get HP LJ P1008 firmware file
-hpp1007 - Get HP LJ P1007 firmware file
-hpp1006 - Get HP LJ P1006 firmware file
-hpp1005 - Get HP LJ P1005 firmware file

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index c84434a..d555394 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -27,7 +27,7 @@ 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="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.