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

["Michał Górny" <mgorny@gentoo.org>]

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.