[profiles] Add use expand for openmpi OPENMPI_

5 files changed, 44 insertions, 3 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8a0fd5debf69..a31e75c93d5c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6437 2012/04/18 16:40:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6438 2012/04/18 20:26:12 alexxy Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> +desc/openmpi_fabrics.desc,
+  +desc/openmpi_ofed_features.desc, +desc/openmpi_rm.desc, base/make.defaults:
+  add use expands for OPENMPI_
+
   18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> updates/2Q-2012:
   move sys-infiniband/openib to ofed
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 24b5e2955dbc..ae72cf21a7b7 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.78 2012/04/12 14:44:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.79 2012/04/18 20:26:12 alexxy Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL 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"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/desc/openmpi_fabrics.desc b/profiles/desc/openmpi_fabrics.desc
new file mode 100644
index 000000000000..795eacf1c5d3
--- /dev/null
+++ b/profiles/desc/openmpi_fabrics.desc
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openmpi_fabrics.desc,v 1.1 2012/04/18 20:26:12 alexxy Exp $
+
+# This file contains descriptions of OPENMPI_FABRICS USE_EXPAND flags.
+
+# Keep it sorted.
+
+dapl - Direct Access Provider Library
+ofed - OFED RDMA stack (InfiniBand and iWARP)
+knem - High-Performance Intra-Node MPI Communication
+open-mx - Myrinet Express over Generic Ethernet Hardware
+psm - QLogic InfiniPath HCA driver (psm based)
+sctp - Stream Control Transmission Protocol
diff --git a/profiles/desc/openmpi_ofed_features.desc b/profiles/desc/openmpi_ofed_features.desc
new file mode 100644
index 000000000000..5d36dd71e35c
--- /dev/null
+++ b/profiles/desc/openmpi_ofed_features.desc
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openmpi_ofed_features.desc,v 1.1 2012/04/18 20:26:12 alexxy Exp $
+
+# This file contains descriptions of OPENMPI_OFED_FEATURES USE_EXPAND flags.
+
+# Keep it sorted.
+
+control-hdr-padding - Add padding bytes to the openib control header
+connectx-xrc - Enable ConnectX XRC support
+rdmacm - Enable Open Fabrics RDMACM support in openib BTL
+dynamic-sl - Enable openib BTL to query Subnet Manager for IB SL
+failover - enable openib BTL failover (for multiport adapters
diff --git a/profiles/desc/openmpi_rm.desc b/profiles/desc/openmpi_rm.desc
new file mode 100644
index 000000000000..19f355a72efc
--- /dev/null
+++ b/profiles/desc/openmpi_rm.desc
@@ -0,0 +1,10 @@
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openmpi_rm.desc,v 1.1 2012/04/18 20:26:12 alexxy Exp $
+
+# This file contains descriptions of OPENMPI_RM USE_EXPAND flags.
+
+# Keep it sorted.
+
+pbs - torque resource manager
+slurm - slurm resource manager