[patch] Add USE_EXPAND support for USB_DRIVERS

usb_drivers_use_expand.patch (text/plain), 11.70 KB, created by Daniel Harding on 2016-10-31 13:04:13 UTC

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ac46b69..0b8f9ca 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 [e-mail].
-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 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 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_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS 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 PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UPS_DRIVERS 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.
diff --git a/profiles/desc/ups_drivers.desc b/profiles/desc/ups_drivers.desc
new file mode 100644
index 00000000..3175244
--- /dev/null
+++ b/profiles/desc/ups_drivers.desc
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This file contains descriptions of UPS_DRIVERS USE_EXPAND flags.
+
+# Keep it sorted.
+
+al175 - UPS_DRIVERS setting to build driver for Eltek UPS models with AL175 alarm module
+apcsmart - UPS_DRIVERS setting to build driver for American Power Conversion Smart Protocol UPS equipment
+apcsmart-old - UPS_DRIVERS setting to build driver for American Power Conversion Smart Protocol UPS equipment
+apcupsd-ups - UPS_DRIVERS setting to build driver for apcupsd client access
+bcmxcp - UPS_DRIVERS setting to build driver for UPSes supporting the serial BCM/XCP protocol
+bcmxcp_usb - UPS_DRIVERS setting to build experimental driver for UPSes supporting the BCM/XCP protocol over USB
+belkin - UPS_DRIVERS setting to build driver for Belkin serial UPS equipment
+belkinunv - UPS_DRIVERS setting to build driver for Belkin "Universal UPS" and compatible
+bestfcom - UPS_DRIVERS setting to build driver for Best Power Fortress/Ferrups
+bestfortress - UPS_DRIVERS setting to build driver for old Best Fortress UPS equipment
+bestuferrups - UPS_DRIVERS setting to build driver for Best Power Micro-Ferrups
+bestups - UPS_DRIVERS setting to build driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment
+blazer_ser - UPS_DRIVERS setting to build driver for Megatec/Q1 protocol serial based UPS equipment
+blazer_usb - UPS_DRIVERS setting to build driver for Megatec/Q1 protocol USB based UPS equipment
+clone - UPS_DRIVERS setting to build fake driver to clone outlets for device grouping
+clone-outlet - UPS_DRIVERS setting to build fake driver to clone outlets for device grouping
+dummy-ups - UPS_DRIVERS setting to build driver for multi-purpose UPS emulation
+etapro - UPS_DRIVERS setting to build driver for ETA UPS equipment
+everups - UPS_DRIVERS setting to build driver for Ever UPS models
+gamatronic - UPS_DRIVERS setting to build driver for Gamatronic UPS equipment
+genericups - UPS_DRIVERS setting to build driver for contact-closure UPS equipment
+isbmex - UPS_DRIVERS setting to build driver for ISBMEX UPS equipment
+ivtscd - UPS_DRIVERS setting to build driver for the IVT Solar Controller Device
+liebert - UPS_DRIVERS setting to build driver for Liebert contact-closure UPS equipment
+liebert-esp2 - UPS_DRIVERS setting to build driver for Liebert UPS, using the ESP-II serial protocol
+masterguard - UPS_DRIVERS setting to build driver for Masterguard UPS equipment
+metasys - UPS_DRIVERS setting to build driver for Meta System UPS equipment
+mge-shut - UPS_DRIVERS setting to build driver for SHUT Protocol UPS equipment
+mge-utalk - UPS_DRIVERS setting to build driver for MGE UPS SYSTEMS UTalk protocol equipment
+microdowell - UPS_DRIVERS setting to build driver for Microdowell Enterprise UPS series
+netxml-ups - UPS_DRIVERS setting to build driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment
+nut-ipmipsu - UPS_DRIVERS setting to build driver for IPMI Power Supply Units (PSU)
+nutdrv_qx - UPS_DRIVERS setting to build driver for Q* protocol serial and USB based UPS equipment
+oldmge-shut - UPS_DRIVERS setting to build driver for SHUT Protocol UPS equipment (older implementation)
+oneac - UPS_DRIVERS setting to build driver for Oneac UPS equipment
+optiups - UPS_DRIVERS setting to build driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment
+powercom - UPS_DRIVERS setting to build UPS driver for serial Powercom/Trust/Advice UPS equipment
+powerpanel - UPS_DRIVERS setting to build driver for PowerPanel Plus compatible UPS equipment
+rhino - UPS_DRIVERS setting to build driver for Brazilian Microsol RHINO UPS equipment
+richcomm_usb - UPS_DRIVERS setting to build driver UPS equipment using Richcomm dry-contact to USB solution
+riello_ser - UPS_DRIVERS setting to build driver for Riello UPS Protocol UPS equipment
+riello_usb - UPS_DRIVERS setting to build driver for Riello UPS Protocol UPS equipment via USB
+safenet - UPS_DRIVERS setting to build driver for SafeNet compatible UPS equipment
+snmp-ups - UPS_DRIVERS setting to build multi-MIB driver for SNMP UPS equipment
+solis - UPS_DRIVERS setting to build driver for Brazilian Microsol SOLIS UPS equipment
+tripplite - UPS_DRIVERS setting to build driver for Tripp-Lite SmartPro UPS equipment
+tripplite_usb - UPS_DRIVERS setting to build driver for older Tripp Lite USB UPSes (not PDC HID)
+tripplitesu - UPS_DRIVERS setting to build driver for Tripp-Lite SmartOnline (SU) UPS equipment
+upscode2 - UPS_DRIVERS setting to build driver for UPScode II compatible UPS equipment
+usbhid-ups - UPS_DRIVERS setting to build driver for USB/HID UPS equipment
+victronups - UPS_DRIVERS setting to build driver for IMV/Victron UPS unit Match, Match Lite, NetUps
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bfe6c74..9e19433 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -10,56 +10,5 @@
 	</maintainer>
   <use>
     <flag name="ipmi">Support IPMI-based UPSes.</flag>
-	<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
-	<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
-	<flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
-	<flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
-	<flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
-	<flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
-	<flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
-	<flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
-	<flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
-	<flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
-	<flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
-	<flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
-	<flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
-	<flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
-	<flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
-	<flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
-	<flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
-	<flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
-	<flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
-	<flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
-	<flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
-	<flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
-	<flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
-	<flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
-	<flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
-	<flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
-	<flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
-	<flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
-	<flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
-	<flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
-	<flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
-	<flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
-	<flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
-	<flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
-	<flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
-	<flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
-	<flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
-	<flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
-	<flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
-	<flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
-	<flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
-	<flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
-	<flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
-	<flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
-	<flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
-	<flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
-	<flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
-	<flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
-	<flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
-	<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
-	<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
   </use>
 </pkgmetadata>