[gentoo-commits] proj/sci:master commit in: sys-infiniband/libibcommon/, sys-infiniband/libmlx4/, ...

[Alexey Shvetsov]

commit:     ff84fa312d3c5f2407620a6a4d5472e13e89f1b8
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 16:28:22 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 16:28:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ff84fa31

[sys-infiniband] Updates to infiniband stuff

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-infiniband/dapl/ChangeLog                      |   36 --
 sys-infiniband/dapl/dapl-2.0.19.ebuild             |   24 --
 .../{dapl-2.0.15.ebuild => dapl-2.0.32.ebuild}     |   10 +-
 sys-infiniband/dapl/files/dapl.conf.2.0.9          |   15 -
 sys-infiniband/ibutils/ChangeLog                   |   14 -
 .../ibutils/files/ibutils-1.2-autotools.patch      |   20 -
 .../ibutils/files/ibutils-1.2-glib-2.10.patch      |   22 -
 .../{ibutils-1.2.ebuild => ibutils-1.5.7.ebuild}   |   15 +-
 .../infiniband-diags-1.5.8.ebuild}                 |   13 +-
 .../metadata.xml                                   |    0
 sys-infiniband/libcxgb3/ChangeLog                  |   10 -
 ...libcxgb3-1.2.2.ebuild => libcxgb3-1.2.5.ebuild} |   10 +-
 sys-infiniband/libehca/ChangeLog                   |   27 --
 sys-infiniband/libehca/libehca-1.2.1-r1.ebuild     |   24 --
 .../{libehca-1.2.1.ebuild => libehca-1.2.2.ebuild} |   10 +-
 sys-infiniband/libibcm/ChangeLog                   |   34 --
 sys-infiniband/libibcm/libibcm-1.0.4-r1.ebuild     |   24 --
 .../{libibcm-1.0.4.ebuild => libibcm-1.0.5.ebuild} |   10 +-
 sys-infiniband/libibcommon/ChangeLog               |   44 ---
 .../libibcommon/libibcommon-1.1.2_p20081020.ebuild |   22 -
 .../libibcommon/libibcommon-1.1.2_p20090314.ebuild |   22 -
 sys-infiniband/libibcommon/metadata.xml            |    9 -
 sys-infiniband/libibmad/ChangeLog                  |   49 ---
 .../libibmad/libibmad-1.2.3_p20090314.ebuild       |   22 -
 ....2.3_p20081118.ebuild => libibmad-1.3.7.ebuild} |   13 +-
 sys-infiniband/libibumad/ChangeLog                 |   45 ---
 .../libibumad/libibumad-1.2.3_p20090314.ebuild     |   21 -
 ...2.3_p20081118.ebuild => libibumad-1.3.7.ebuild} |   12 +-
 sys-infiniband/libibverbs/ChangeLog                |   54 ---
 .../libibverbs/files/libibverbs-1.1.2-pcfile.patch |   53 ---
 sys-infiniband/libibverbs/libibverbs-1.1.2.ebuild  |   23 --
 ...rbs-1.1.2-r1.ebuild => libibverbs-1.1.4.ebuild} |   15 +-
 sys-infiniband/libibvpp/ChangeLog                  |   21 -
 sys-infiniband/libibvpp/libibvpp-0.1.ebuild        |    4 +-
 sys-infiniband/libipathverbs/ChangeLog             |   17 -
 .../libipathverbs/libipathverbs-1.1-r1.ebuild      |   22 -
 ...thverbs-1.1.ebuild => libipathverbs-1.2.ebuild} |   10 +-
 sys-infiniband/libmlx4/ChangeLog                   |   20 -
 ...{libmlx4-1.0-r1.ebuild => libmlx4-1.0.1.ebuild} |   10 +-
 sys-infiniband/libmlx4/libmlx4-1.0.ebuild          |   23 --
 sys-infiniband/libmthca/ChangeLog                  |   31 --
 ...ca-1.0.5-r1.ebuild => libmthca-1.0.5-r2.ebuild} |   10 +-
 sys-infiniband/libmthca/libmthca-1.0.5.ebuild      |   23 --
 sys-infiniband/libnes/ChangeLog                    |   19 -
 sys-infiniband/libnes/libnes-0.5.ebuild            |   23 --
 .../{libnes-0.6.ebuild => libnes-1.1.1.ebuild}     |   10 +-
 sys-infiniband/librdmacm/ChangeLog                 |   39 --
 .../librdmacm/files/librdmacm-1.0.8-pcfile.patch   |   52 ---
 ...m-1.0.8-r1.ebuild => librdmacm-1.0.14.1.ebuild} |   17 +-
 sys-infiniband/librdmacm/librdmacm-1.0.8.ebuild    |   22 -
 sys-infiniband/libsdp/ChangeLog                    |   22 -
 ...bsdp-1.1.99-r1.ebuild => libsdp-1.1.108.ebuild} |    6 +-
 sys-infiniband/libsdp/libsdp-1.1.99.ebuild         |   14 -
 sys-infiniband/openib-diags/ChangeLog              |   44 ---
 .../openib-diags-1.4.4_p20081207-remove-osmv.patch |  403 --------------------
 .../openib-diags-1.4.4_p20081207.ebuild            |   23 --
 .../openib-files/openib-files-1.4.ebuild           |  128 -------
 ...es-1.4.1.ebuild => openib-files-1.5.3.1.ebuild} |    8 +-
 sys-infiniband/openib-mvapich2/ChangeLog           |   40 --
 .../openib-mvapich2/files/eselect.mpi.mvapich2     |    8 -
 sys-infiniband/openib-mvapich2/metadata.xml        |   14 -
 .../openib-mvapich2/openib-mvapich2-0.9.5.ebuild   |  116 ------
 .../openib-mvapich2/openib-mvapich2-0.9.6.ebuild   |  116 ------
 .../openib-mvapich2-1.0.1-r1.ebuild                |  155 --------
 .../openib-mvapich2/openib-mvapich2-1.0.1.ebuild   |  113 ------
 .../openib-mvapich2/openib-mvapich2-1.0.ebuild     |  113 ------
 .../files/openib-osm-3.2.6_p20090317-fix.patch     |   11 -
 .../openib-osm/openib-osm-3.2.6_p20090317.ebuild   |   48 ---
 sys-infiniband/openib-perf/ChangeLog               |   19 -
 .../openib-srptools/openib-srptools-1.1.ebuild     |   17 -
 .../openib-userspace-1.2.5.1-r1.ebuild             |   92 -----
 .../openib-userspace/openib-userspace-1.2.ebuild   |   82 ----
 sys-infiniband/openib/openib-1.4.1.ebuild          |   32 --
 sys-infiniband/openib/openib-1.4.ebuild            |   32 --
 sys-infiniband/openib/openib-1.5.3.1.ebuild        |   31 ++
 sys-infiniband/{openib-osm => opensm}/ChangeLog    |    0
 .../{openib-osm => opensm}/files/opensm.init.d     |    0
 sys-infiniband/{openib-osm => opensm}/metadata.xml |    0
 .../opensm-3.3.9.ebuild}                           |   10 +-
 .../{openib-perf => perftest}/metadata.xml         |    0
 .../perftest-1.3.0.ebuild}                         |   10 +-
 ...rds-tools-1.4.ebuild => rds-tools-2.0.4.ebuild} |   10 +-
 .../{openib-srptools => srptools}/ChangeLog        |    0
 .../{openib-srptools => srptools}/metadata.xml     |    0
 sys-infiniband/srptools/srptools-0.0.4.ebuild      |   15 +
 85 files changed, 146 insertions(+), 2681 deletions(-)

diff --git a/sys-infiniband/dapl/ChangeLog b/sys-infiniband/dapl/ChangeLog
deleted file mode 100644
index d0d7e72..0000000
--- a/sys-infiniband/dapl/ChangeLog
+++ /dev/null
@@ -1,36 +0,0 @@
-# ChangeLog for sys-infiniband/dapl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*dapl-2.0.19 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> +dapl-2.0.19.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -dapl-1.2.2-r1.ebuild,
-  -dapl-2.0.1-r1.ebuild, -dapl-2.0.9.ebuild:
-  Drop old versions
-
-*dapl-2.0.15 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +dapl-2.0.15.ebuild:
-  Version bump
-
-*dapl-2.0.9 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added dapl-2.0.9.ebuild
-
-*dapl-1.2.2 (27 Nov 2007)
-*dapl-2.0.1 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -dapl-1.1.ebuild: removed
-  +dapl-1.2.2.ebuild, dapl-2.0.1.ebuild: added
-
-*dapl-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/dapl/dapl-2.0.19.ebuild b/sys-infiniband/dapl/dapl-2.0.19.ebuild
deleted file mode 100644
index 99e1024..0000000
--- a/sys-infiniband/dapl/dapl-2.0.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1"
-
-inherit openib
-
-DESCRIPTION="OpenIB - Direct Access Provider Library"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2-r1
-		>=sys-infiniband/librdmacm-1.0.8-r1"
-RDEPEND="${DEPEND}
-		!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS
-}

diff --git a/sys-infiniband/dapl/dapl-2.0.15.ebuild b/sys-infiniband/dapl/dapl-2.0.32.ebuild
similarity index 70%
rename from sys-infiniband/dapl/dapl-2.0.15.ebuild
rename to sys-infiniband/dapl/dapl-2.0.32.ebuild
index 0147bbd..2164bc3 100644
--- a/sys-infiniband/dapl/dapl-2.0.15.ebuild
+++ b/sys-infiniband/dapl/dapl-2.0.32.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
+OFED_VER="1.5.3.1"
 OFED_SUFFIX="1"
 
 inherit openib
@@ -13,8 +13,8 @@ DESCRIPTION="OpenIB - Direct Access Provider Library"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2
-		>=sys-infiniband/librdmacm-1.0.8"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4
+		>=sys-infiniband/librdmacm-1.0.14.1"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 

diff --git a/sys-infiniband/dapl/files/dapl.conf.2.0.9 b/sys-infiniband/dapl/files/dapl.conf.2.0.9
deleted file mode 100644
index eaf20f2..0000000
--- a/sys-infiniband/dapl/files/dapl.conf.2.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Each entry should have the following fields:
-#
-# <ia_name> <api_version> <threadsafety> <default> <lib_path> \
-#           <provider_version> <ia_params> <platform_params>
-#
-# For the uDAPL cma provder, specify <ia_params> as one of the following:
-#       network address, network hostname, or netdev name and 0 for port
-
-ofa-v2-ib0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib0 0" ""
-ofa-v2-ib1 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib1 0" ""
-ofa-v2-ib2 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib2 0" ""
-ofa-v2-ib3 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib3 0" ""
-ofa-v2-bond u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "bond0 0" ""
-

diff --git a/sys-infiniband/ibutils/ChangeLog b/sys-infiniband/ibutils/ChangeLog
deleted file mode 100644
index 7cf4d57..0000000
--- a/sys-infiniband/ibutils/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for sys-infiniband/ibutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  15 Oct 2009; Alexey Shvetsov <alexxy@g.o> ibutils-1.2.ebuild,
-  +files/ibutils-1.2-autotools.patch, +files/ibutils-1.2-glib-2.10.patch:
-  Fix bug 289037. thanks to Kacper Kowalik
-
-*ibutils-1.2 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> +ibutils-1.2.ebuild,
-  +metadata.xml:
-  Version Bump
-

diff --git a/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch b/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch
deleted file mode 100644
index 9b44b90..0000000
--- a/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ibutils-1.2.orig/ibdm/ibdm/Makefile.in	2009-05-27 17:26:57.000000000 +0200
-+++ ibutils-1.2/ibdm/ibdm/Makefile.in	2009-10-14 17:18:24.950978547 +0200
-@@ -293,6 +293,7 @@
- libibdm_la_LDFLAGS = -Wl,-rpath -Wl,$(TCL_PREFIX)/lib -version-info $(LIB_VER_TRIPLET) -no-undefined
- ibdmsh_SOURCES = ibdmsh_wrap.cpp
- ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
-+ibdmsh_DEPENDENCIES = libibdmcom.la
- ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
- 
- # track latest GIT version for this tree:
---- ibutils-1.2.orig/ibdm/ibdm/Makefile.am	2009-05-27 17:26:45.000000000 +0200
-+++ ibutils-1.2/ibdm/ibdm/Makefile.am	2009-10-14 17:18:44.763825873 +0200
-@@ -87,6 +87,7 @@
- bin_PROGRAMS  = ibdmsh
- ibdmsh_SOURCES = ibdmsh_wrap.cpp
- ibdmsh_LDADD =  -libdmcom $(TCL_LIBS)
-+ibdmsh_DEPENDENCIES = libibdmcom.la
- ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
- 
- $(srcdir)/Fabric.cpp: $(srcdir)/git_version.h

diff --git a/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch b/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch
deleted file mode 100644
index 57e4863..0000000
--- a/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ibutils-1.2.orig/ibdm/ibdm/TopoMatch.cpp	2009-05-27 17:26:45.000000000 +0200
-+++ ibutils-1.2/ibdm/ibdm/TopoMatch.cpp	2009-10-14 16:02:49.535651042 +0200
-@@ -676,7 +676,7 @@
-   IBSystem *p_system = p_node->p_system;
- 
-   // we always mark the board of the node by examining all but the "UXXX"
--  char *p_lastSlash = rindex(p_node->name.c_str(), '/');
-+  const char *p_lastSlash = rindex(p_node->name.c_str(), '/');
-   char nodeBoardName[512];
-   int  boardNameLength;
-   if (!p_lastSlash) {
---- ibutils-1.2.orig/ibdm/ibdm/SysDef.cpp	2009-05-27 17:26:45.000000000 +0200
-+++ ibutils-1.2/ibdm/ibdm/SysDef.cpp	2009-10-14 16:03:12.178724234 +0200
-@@ -79,7 +79,7 @@
- 
-       // the device number should be embedded in the master name of
-       // the node: MT23108 ...
--      char *p_digit;
-+      const char *p_digit;
-       if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL)
-         sscanf(p_digit,"%u", &p_node->devId);
- 

diff --git a/sys-infiniband/ibutils/ibutils-1.2.ebuild b/sys-infiniband/ibutils/ibutils-1.5.7.ebuild
similarity index 60%
rename from sys-infiniband/ibutils/ibutils-1.2.ebuild
rename to sys-infiniband/ibutils/ibutils-1.5.7.ebuild
index cc4746a..d094200 100644
--- a/sys-infiniband/ibutils/ibutils-1.2.ebuild
+++ b/sys-infiniband/ibutils/ibutils-1.5.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -13,16 +13,11 @@ DESCRIPTION="OpenIB userspace tools"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2
+DEPEND=">=sys-infiniband/libibverbs-1.1.4
 		>=dev-lang/tk-8.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 
-PATCHES=(
-			"${FILESDIR}/${P}-autotools.patch"
-			"${FILESDIR}/${P}-glib-2.10.patch"
-		)
-
 src_install() {
 	make DESTDIR="${D}" install || die "install failed"
 	dodoc README AUTHORS ChangeLog

diff --git a/sys-infiniband/openib-diags/openib-diags-1.4.4_p20090314.ebuild b/sys-infiniband/infiniband-diags/infiniband-diags-1.5.8.ebuild
similarity index 55%
rename from sys-infiniband/openib-diags/openib-diags-1.4.4_p20090314.ebuild
rename to sys-infiniband/infiniband-diags/infiniband-diags-1.5.8.ebuild
index acfe19d..3ce59c7 100644
--- a/sys-infiniband/openib-diags/openib-diags-1.4.4_p20090314.ebuild
+++ b/sys-infiniband/infiniband-diags/infiniband-diags-1.5.8.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -14,8 +14,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="
-	>=sys-infiniband/libibcommon-1.1.2_p20090314
-	>=sys-infiniband/libibumad-1.2.3_p20090314
-	>=sys-infiniband/libibmad-1.2.3_p20090314
-	>=sys-infiniband/openib-osm-3.2.5_p20090314"
+	>=sys-infiniband/libibumad-1.3.7
+	>=sys-infiniband/libibmad-1.3.7
+	>=sys-infiniband/opensm-3.3.9"
 RDEPEND="${DEPEND}"

diff --git a/sys-infiniband/openib-diags/metadata.xml b/sys-infiniband/infiniband-diags/metadata.xml
similarity index 100%
rename from sys-infiniband/openib-diags/metadata.xml
rename to sys-infiniband/infiniband-diags/metadata.xml

diff --git a/sys-infiniband/libcxgb3/ChangeLog b/sys-infiniband/libcxgb3/ChangeLog
deleted file mode 100644
index 0e6b3d9..0000000
--- a/sys-infiniband/libcxgb3/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog for sys-infiniband/libcxgb3
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libcxgb3-1.2.2 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> +libcxgb3-1.2.2.ebuild,
-  +metadata.xml:
-  Version Bump
-

diff --git a/sys-infiniband/libcxgb3/libcxgb3-1.2.2.ebuild b/sys-infiniband/libcxgb3/libcxgb3-1.2.5.ebuild
similarity index 71%
rename from sys-infiniband/libcxgb3/libcxgb3-1.2.2.ebuild
rename to sys-infiniband/libcxgb3/libcxgb3-1.2.5.ebuild
index 0228905..6695bbd 100644
--- a/sys-infiniband/libcxgb3/libcxgb3-1.2.2.ebuild
+++ b/sys-infiniband/libcxgb3/libcxgb3-1.2.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2-r1"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libehca/ChangeLog b/sys-infiniband/libehca/ChangeLog
deleted file mode 100644
index 77afdca..0000000
--- a/sys-infiniband/libehca/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-# ChangeLog for sys-infiniband/libehca
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libehca-1.2.1-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> libehca-1.2.1.ebuild,
-  +libehca-1.2.1-r1.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -libehca-1.2.ebuild:
-  Drop old versions
-
-*libehca-1.2.1 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +libehca-1.2.1.ebuild:
-  Version bump
-
-  09 Jul 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libehca-1.2.ebuild
-  removed libehca-1.1.ebuild
-
-*libehca-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libehca/libehca-1.2.1-r1.ebuild b/sys-infiniband/libehca/libehca-1.2.1-r1.ebuild
deleted file mode 100644
index 4709d41..0000000
--- a/sys-infiniband/libehca/libehca-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="OpenIB - IBM eServer eHCA Infiniband device driver for Linux on POWER"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2-r1"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README INSTALL
-}

diff --git a/sys-infiniband/libehca/libehca-1.2.1.ebuild b/sys-infiniband/libehca/libehca-1.2.2.ebuild
similarity index 71%
rename from sys-infiniband/libehca/libehca-1.2.1.ebuild
rename to sys-infiniband/libehca/libehca-1.2.2.ebuild
index c6bfb15..6b253c0 100644
--- a/sys-infiniband/libehca/libehca-1.2.1.ebuild
+++ b/sys-infiniband/libehca/libehca-1.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="0.1.g69e1a88"
 
 inherit openib
 
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB - IBM eServer eHCA Infiniband device driver for Linux on POW
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libibcm/ChangeLog b/sys-infiniband/libibcm/ChangeLog
deleted file mode 100644
index 3c300cb..0000000
--- a/sys-infiniband/libibcm/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-# ChangeLog for sys-infiniband/libibcm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  10 Jul 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de>
-  libibcm-1.0.4.ebuild:
-  Silenced repoman.
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -libibcm-1.0.1.ebuild,
-  -libibcm-1.0.2.ebuild:
-  Drop old versions
-
-*libibcm-1.0.4 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +libibcm-1.0.4.ebuild:
-  Version bump
-
-*libibcm-1.0.2 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libibcm-1.0.2.ebuild
-
-*libibcm-1.0.1 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -libibcm-1.1.ebuild: removed
-  +libibcm-1.0.1.ebuild: added
-
-*libibcm-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libibcm/libibcm-1.0.4-r1.ebuild b/sys-infiniband/libibcm/libibcm-1.0.4-r1.ebuild
deleted file mode 100644
index 07b9493..0000000
--- a/sys-infiniband/libibcm/libibcm-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-KEYWORDS="~x86 ~amd64"
-
-DESCRIPTION="OpenIB Userspace CM library"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=sys-infiniband/libibverbs-1.1.2"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libibcm/libibcm-1.0.4.ebuild b/sys-infiniband/libibcm/libibcm-1.0.5.ebuild
similarity index 70%
rename from sys-infiniband/libibcm/libibcm-1.0.4.ebuild
rename to sys-infiniband/libibcm/libibcm-1.0.5.ebuild
index 25fe537..3dc74d7 100644
--- a/sys-infiniband/libibcm/libibcm-1.0.4.ebuild
+++ b/sys-infiniband/libibcm/libibcm-1.0.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB Userspace CM library"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-RDEPEND=">=sys-infiniband/libibverbs-1.1.2"
+RDEPEND=">=sys-infiniband/libibverbs-1.1.4"
 DEPEND="${RDEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libibcommon/ChangeLog b/sys-infiniband/libibcommon/ChangeLog
deleted file mode 100644
index 4700f4a..0000000
--- a/sys-infiniband/libibcommon/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-# ChangeLog for sys-infiniband/libibcommon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libibcommon-1.1.2_p20090314 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibcommon-1.1.2_p20090314.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o>
-  -libibcommon-1.0.5.ebuild, -libibcommon-1.1.0.ebuild:
-  Drop old versions
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  libibcommon-1.0.5.ebuild, libibcommon-1.1.0.ebuild:
-  [QA]: Remove redundant src_compile
-
-*libibcommon-1.1.2_20081020 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibcommon-1.1.2_p20081020.ebuild:
-  Version bump
-
-*libibcommon-1.1.0 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libibcommon-1.1.0.ebuild
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added ~x86 keyword, fixed copyright date
-
-*libibcommon-1.0.5 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -libibcommon-1.1.ebuild: removed
-  +libibcommon-1.0.5.ebuild: added
-
-*libibcommon-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libibcommon/libibcommon-1.1.2_p20081020.ebuild b/sys-infiniband/libibcommon/libibcommon-1.1.2_p20081020.ebuild
deleted file mode 100644
index 0eebdf6..0000000
--- a/sys-infiniband/libibcommon/libibcommon-1.1.2_p20081020.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB library that provides common utility functions for the IB diagnostic and management tools"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}

diff --git a/sys-infiniband/libibcommon/libibcommon-1.1.2_p20090314.ebuild b/sys-infiniband/libibcommon/libibcommon-1.1.2_p20090314.ebuild
deleted file mode 100644
index cd9c451..0000000
--- a/sys-infiniband/libibcommon/libibcommon-1.1.2_p20090314.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-DESCRIPTION="OpenIB library that provides common utility functions for the IB diagnostic and management tools"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}

diff --git a/sys-infiniband/libibcommon/metadata.xml b/sys-infiniband/libibcommon/metadata.xml
deleted file mode 100644
index e53757b..0000000
--- a/sys-infiniband/libibcommon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cluster</herd>
-<longdescription>
-OpenIB library that provides common utility functions for the IB diagnostic and
-management tools
-</longdescription>
-</pkgmetadata>

diff --git a/sys-infiniband/libibmad/ChangeLog b/sys-infiniband/libibmad/ChangeLog
deleted file mode 100644
index 6e34b5f..0000000
--- a/sys-infiniband/libibmad/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-# ChangeLog for sys-infiniband/libibmad
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  09 Jul 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de>
-  libibmad-1.2.3_p20081118.ebuild, libibmad-1.2.3_p20090314.ebuild:
-  Shortened DESCRIPTION.
-
-*libibmad-1.2.3_p20090314 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibmad-1.2.3_p20090314.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -libibmad-1.1.2.ebuild,
-  -libibmad-1.2.0.ebuild:
-  Drop old versions
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  sys-cluster/libibmad/libibmad-1.1.2.ebuild,
-  sys-cluster/libibmad/libibmad-1.2.0.ebuild:
-  [QA]: Remove redundant src_compile
-
-*libibmad-1.2.3_p20081118 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibmad-1.2.3_p20081118.ebuild:
-  Version bump
-
-*libibmad-1.2.0 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libibmad-1.2.0.ebuild
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added ~x86 keyword, fixed copyright date
-
-*libibmad-1.1.2 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -libibmad-1.1.ebuild: removed
-  +libibmad-1.1.2.ebuild: added
-
-*libibmad-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libibmad/libibmad-1.2.3_p20090314.ebuild b/sys-infiniband/libibmad/libibmad-1.2.3_p20090314.ebuild
deleted file mode 100644
index 06f39ab..0000000
--- a/sys-infiniband/libibmad/libibmad-1.2.3_p20090314.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-DESCRIPTION="OpenIB library providing low layer IB functions for use by the IB diagnostic/management programs"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibcommon-1.1.2_p20090314
-		>=sys-infiniband/libibumad-1.2.3_p20090314"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}

diff --git a/sys-infiniband/libibmad/libibmad-1.2.3_p20081118.ebuild b/sys-infiniband/libibmad/libibmad-1.3.7.ebuild
similarity index 64%
rename from sys-infiniband/libibmad/libibmad-1.2.3_p20081118.ebuild
rename to sys-infiniband/libibmad/libibmad-1.3.7.ebuild
index 21118d1..75b7a44 100644
--- a/sys-infiniband/libibmad/libibmad-1.2.3_p20081118.ebuild
+++ b/sys-infiniband/libibmad/libibmad-1.3.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -13,8 +13,9 @@ DESCRIPTION="OpenIB library providing low layer IB functions for use by the IB d
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibcommon-1.1.2_p20081020
-		>=sys-infiniband/libibumad-1.2.3_p20081118"
+DEPEND="
+	>=sys-infiniband/libibumad-1.3.7
+	"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libibumad/ChangeLog b/sys-infiniband/libibumad/ChangeLog
deleted file mode 100644
index ae38cfe..0000000
--- a/sys-infiniband/libibumad/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-# ChangeLog for sys-infiniband/libibumad
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libibumad-1.2.3_p20090314 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibumad-1.2.3_p20090314.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -libibumad-1.1.3.ebuild,
-  -libibumad-1.2.0.ebuild:
-  Drop old versions
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  sys-cluster/libibumad/libibumad-1.1.3.ebuild,
-  sys-cluster/libibumad/libibumad-1.2.0.ebuild:
-  [QA]: Remove redundant src_compile
-
-*libibumad-1.2.3_p2008118 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o>
-  +libibumad-1.2.3_p20081118.ebuild:
-  Version bump
-
-*libibumad-1.2.0 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libibumad-1.2.0.ebuild
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added ~x86 keyword, fixed copyright date
-
-*libibumad-1.1.3 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -libibumad.1.1.ebuild: removed
-  +libibumad.1.1.3.ebuild: added
-
-*libibumad-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libibumad/libibumad-1.2.3_p20090314.ebuild b/sys-infiniband/libibumad/libibumad-1.2.3_p20090314.ebuild
deleted file mode 100644
index f881827..0000000
--- a/sys-infiniband/libibumad/libibumad-1.2.3_p20090314.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-DESCRIPTION="OpenIB User MAD library functions which sit on top of the user MAD modules in the kernel."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibcommon-1.1.2_p20090314"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}

diff --git a/sys-infiniband/libibumad/libibumad-1.2.3_p20081118.ebuild b/sys-infiniband/libibumad/libibumad-1.3.7.ebuild
similarity index 69%
rename from sys-infiniband/libibumad/libibumad-1.2.3_p20081118.ebuild
rename to sys-infiniband/libibumad/libibumad-1.3.7.ebuild
index 29f7873..d935686 100644
--- a/sys-infiniband/libibumad/libibumad-1.2.3_p20081118.ebuild
+++ b/sys-infiniband/libibumad/libibumad-1.3.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -13,7 +13,9 @@ DESCRIPTION="OpenIB User MAD library functions which sit on top of the user MAD
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibcommon-1.1.2_p20081020"
+DEPEND="
+	>=sys-infiniband/libibverbs-1.1.4
+	"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libibverbs/ChangeLog b/sys-infiniband/libibverbs/ChangeLog
deleted file mode 100644
index 1271868..0000000
--- a/sys-infiniband/libibverbs/ChangeLog
+++ /dev/null
@@ -1,54 +0,0 @@
-# ChangeLog for sys-infiniband/libibverbs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jun 2010; Kacper Kowalik <xarthisius@g.o>
-  libibverbs-1.1.2-r1.ebuild, +files/libibverbs-1.1.2-pcfile.patch:
-  sys-infiniband/libibverbs: adding pc file
-
-*libibverbs-1.1.2-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> libibverbs-1.1.2.ebuild,
-  +libibverbs-1.1.2-r1.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o> -libibverbs-1.0.3.ebuild,
-  -libibverbs-1.1.1.ebuild:
-  Drop old versions
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  sys-cluster/libibverbs/libibverbs-1.0.3.ebuild,
-  sys-cluster/libibverbs/libibverbs-1.1.1.ebuild:
-  [QA]: Remove redundant src_compile
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added ~x86 keyword, fixed copyright date
-
-*libibverbs-1.1.2 (10 May 2008)
-  10 May 2008; Bryan Green <bryan.d.green@××××.gov>
-  +libibverbs-1.1.2.ebuild: added
-
-*libibverbs-1.1.1 (26 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov>
-  +libibverbs-1.1.1.ebuild: version bump to 1.1.1.  
-  -libibverbs-1.1.ebuild: removed
-  libibverbs-1.0.3.ebuild:
-  Accounted for mutually exclusive openib-userspace
-  ebuild.
-
-*libibverbs-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov>
-  +libibverbs-1.1.ebuild ChangeLog, -libibverbs-1.1_rc6.ebuild:
-  added ebuild for ofed-1.1.  Fixed 'LICENSE' and 'HOMEPAGE'.
-
-  03 Oct 2006; Bryan Green <bryan.d.green@××××.gov>
-  -libibverbs-1.0.9999.ebuild, -libibverbs-1.1.9999.ebuild:
-  Removed live ebuilds
-
-  27 Sep 2006; Bryan Green <bgreen@××××××××.gov>
-  +libibverbs-1.0.3.ebuild, +libibverbs-1.0.9999.ebuild,
-  +libibverbs-1.1.9999.ebuild, +libibverbs-1.1_rc6.ebuild:
-  Initial import
-

diff --git a/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch b/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch
deleted file mode 100644
index a870a5b..0000000
--- a/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -22,6 +22,18 @@
-     fi
- fi
- 
-+dnl Additional arguments (and substitutions)
-+dnl Allow the pkg-config directory to be set
-+AC_ARG_WITH(pkgconfigdir,
-+        AC_HELP_STRING([--with-pkgconfigdir],
-+        [Use the specified pkgconfig dir (default is libdir/pkgconfig)]),
-+        [pkgconfigdir=${withval}],
-+        [pkgconfigdir='${libdir}/pkgconfig'])
-+
-+AC_SUBST([pkgconfigdir])
-+AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
-+
-+
- dnl Checks for programs
- AC_PROG_CC
- AC_PROG_LN_S
-@@ -66,5 +78,5 @@
-     AC_DEFINE([HAVE_SYMVER_SUPPORT], 1, [assembler has .symver support])
- fi
- 
--AC_CONFIG_FILES([Makefile libibverbs.spec])
-+AC_CONFIG_FILES([Makefile libibverbs.spec ibverbs.pc:ibverbs.pc.in])
- AC_OUTPUT
---- Makefile.am
-+++ Makefile.am
-@@ -1,5 +1,8 @@
- INCLUDES = -I$(srcdir)/include
- 
-+pkgconfigdir = @pkgconfigdir@
-+pkgconfig_DATA = ibverbs.pc
-+
- lib_LTLIBRARIES = src/libibverbs.la
- 
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE
---- /dev/null
-+++ ibverbs.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Version: @PACKAGE_VERSION@
-+Description: @PACKAGE_STRING@
-+Requires:
-+Libs: -L${libdir} -libverbs
-+Cflags: -I${includedir}

diff --git a/sys-infiniband/libibverbs/libibverbs-1.1.2.ebuild b/sys-infiniband/libibverbs/libibverbs-1.1.2.ebuild
deleted file mode 100644
index 20c82b8..0000000
--- a/sys-infiniband/libibverbs/libibverbs-1.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-fs/sysfsutils"
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild b/sys-infiniband/libibverbs/libibverbs-1.1.4.ebuild
similarity index 66%
rename from sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild
rename to sys-infiniband/libibverbs/libibverbs-1.1.4.ebuild
index 9eac99a..186e258 100644
--- a/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild
+++ b/sys-infiniband/libibverbs/libibverbs-1.1.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1.22.g7257cd3"
 
-inherit autotools eutils openib
+inherit eutils openib
 
 DESCRIPTION="A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware"
 KEYWORDS="~amd64 ~x86"
@@ -17,11 +17,6 @@ DEPEND="sys-fs/sysfsutils"
 RDEPEND="${DEPEND}
 	!sys-infiniband/openib-userspace"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pcfile.patch
-	eautoreconf
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc README AUTHORS ChangeLog || die

diff --git a/sys-infiniband/libibvpp/ChangeLog b/sys-infiniband/libibvpp/ChangeLog
deleted file mode 100644
index 7a97b09..0000000
--- a/sys-infiniband/libibvpp/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-# ChangeLog for sys-infiniband/libibvpp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  10 Jul 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de>
-  libibvpp-0.1.ebuild:
-  Silenced repoman.
-
-  24 Jul 2009; Bryan Green <bryan.d.green@××××.gov> libibvpp-0.1.ebuild:
-  changed sys-cluster to sys-infiniband in dependencies
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  sys-cluster/libibvpp/libibvpp-0.1.ebuild:
-  [QA]: Remove redundant src_compile, fix SRC_URI for new location
-
-*libibvpp-0.1 (28 May 2008)
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov>
-  +libibverbs-0.1.ebuild:
-  Initial import
-

diff --git a/sys-infiniband/libibvpp/libibvpp-0.1.ebuild b/sys-infiniband/libibvpp/libibvpp-0.1.ebuild
index 54b1cce..626dbee 100644
--- a/sys-infiniband/libibvpp/libibvpp-0.1.ebuild
+++ b/sys-infiniband/libibvpp/libibvpp-0.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="4"
+
 SLOT="0"
 LICENSE="NOSA BSD-2"
 

diff --git a/sys-infiniband/libipathverbs/ChangeLog b/sys-infiniband/libipathverbs/ChangeLog
deleted file mode 100644
index 4055532..0000000
--- a/sys-infiniband/libipathverbs/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for sys-cluster/libipathverbs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o>
-  -libipathverbs-1.1-r1.ebuild, +libipathverbs-1.1.ebuild:
-  Version bump
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libibpathverbs-1.1-r1.ebuild
-  removed libibpathverbs-1.1.ebuild
-
-*libipathverbs-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libipathverbs/libipathverbs-1.1-r1.ebuild b/sys-infiniband/libipathverbs/libipathverbs-1.1-r1.ebuild
deleted file mode 100644
index 6aeab02..0000000
--- a/sys-infiniband/libipathverbs/libipathverbs-1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHOR
-}

diff --git a/sys-infiniband/libipathverbs/libipathverbs-1.1.ebuild b/sys-infiniband/libipathverbs/libipathverbs-1.2.ebuild
similarity index 70%
rename from sys-infiniband/libipathverbs/libipathverbs-1.1.ebuild
rename to sys-infiniband/libipathverbs/libipathverbs-1.2.ebuild
index f2d65bc..9ab7c1c 100644
--- a/sys-infiniband/libipathverbs/libipathverbs-1.1.ebuild
+++ b/sys-infiniband/libipathverbs/libipathverbs-1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -13,7 +13,7 @@ DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/libmlx4/ChangeLog b/sys-infiniband/libmlx4/ChangeLog
deleted file mode 100644
index 88d0528..0000000
--- a/sys-infiniband/libmlx4/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-# ChangeLog for sys-infiniband/libmlx4
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  10 Jul 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de>
-  libmlx4-1.0-r1.ebuild:
-  Silenced repoman.
-
-*libmlx4-1.0-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> libmlx4-1.0.ebuild,
-  +libmlx4-1.0-r1.ebuild:
-  Version Bump
-
-*libmlx4-1.0 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +metadata.xml,
-  +libmlx4-1.0.ebuild:
-  Version bump
-

diff --git a/sys-infiniband/libmlx4/libmlx4-1.0-r1.ebuild b/sys-infiniband/libmlx4/libmlx4-1.0.1.ebuild
similarity index 71%
rename from sys-infiniband/libmlx4/libmlx4-1.0-r1.ebuild
rename to sys-infiniband/libmlx4/libmlx4-1.0.1.ebuild
index 6032e93..8007cc2 100644
--- a/sys-infiniband/libmlx4/libmlx4-1.0-r1.ebuild
+++ b/sys-infiniband/libmlx4/libmlx4-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1.18.gb810a27"
 
 inherit openib
 
@@ -13,7 +13,7 @@ DESCRIPTION="OpenIB userspace driver for Mellanox ConnectX HCA"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 

diff --git a/sys-infiniband/libmlx4/libmlx4-1.0.ebuild b/sys-infiniband/libmlx4/libmlx4-1.0.ebuild
deleted file mode 100644
index bdb0da0..0000000
--- a/sys-infiniband/libmlx4/libmlx4-1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB userspace driver for Mellanox ConnectX HCA"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
-RDEPEND="${DEPEND}
-		!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libmthca/ChangeLog b/sys-infiniband/libmthca/ChangeLog
deleted file mode 100644
index f11b45e..0000000
--- a/sys-infiniband/libmthca/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-# ChangeLog for sys-infiniband/libmthca
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libmthca-1.0.5-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> libmthca-1.0.5.ebuild,
-  +libmthca-1.0.5-r1.ebuild:
-  Version Bump
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> -libmthca-1.0.4.ebuild,
-  libmthca-1.0.5.ebuild:
-  Version bump
-
-*libmthca-1.0.5 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added libmthca-1.0.5.ebuild
-
-*libmthca-1.0.4 (26 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  replaced old -userspace version with standalone version.
-  -libmthca-1.1.ebuild: removed
-  +libmthca-1.0.4.ebuild: added
-
-*libmthca-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial import
-

diff --git a/sys-infiniband/libmthca/libmthca-1.0.5-r1.ebuild b/sys-infiniband/libmthca/libmthca-1.0.5-r2.ebuild
similarity index 72%
rename from sys-infiniband/libmthca/libmthca-1.0.5-r1.ebuild
rename to sys-infiniband/libmthca/libmthca-1.0.5-r2.ebuild
index 140b428..9244ce2 100644
--- a/sys-infiniband/libmthca/libmthca-1.0.5-r1.ebuild
+++ b/sys-infiniband/libmthca/libmthca-1.0.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="0.1.gbe5eef3"
 
 inherit openib
 
@@ -13,7 +13,7 @@ DESCRIPTION="OpenIB userspace driver for Mellanox InfiniBand HCAs"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 

diff --git a/sys-infiniband/libmthca/libmthca-1.0.5.ebuild b/sys-infiniband/libmthca/libmthca-1.0.5.ebuild
deleted file mode 100644
index f61dc1a..0000000
--- a/sys-infiniband/libmthca/libmthca-1.0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB userspace driver for Mellanox InfiniBand HCAs"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libnes/ChangeLog b/sys-infiniband/libnes/ChangeLog
deleted file mode 100644
index 73f816a..0000000
--- a/sys-infiniband/libnes/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for sys-infiniband/libnes
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  10 Jul 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de>
-  libnes-0.5.ebuild:
-  Silenced repoman.
-
-*libnes-0.6 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> +libnes-0.6.ebuild:
-  Version Bump
-
-*libnes-0.5 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +metadata.xml,
-  +libnes-0.5.ebuild:
-  Version bump
-

diff --git a/sys-infiniband/libnes/libnes-0.5.ebuild b/sys-infiniband/libnes/libnes-0.5.ebuild
deleted file mode 100644
index b0cf0a3..0000000
--- a/sys-infiniband/libnes/libnes-0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="NetEffect RNIC Userspace Library"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libnes/libnes-0.6.ebuild b/sys-infiniband/libnes/libnes-1.1.1.ebuild
similarity index 71%
rename from sys-infiniband/libnes/libnes-0.6.ebuild
rename to sys-infiniband/libnes/libnes-1.1.1.ebuild
index 281ff5f..5ca65c1 100644
--- a/sys-infiniband/libnes/libnes-0.6.ebuild
+++ b/sys-infiniband/libnes/libnes-1.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -13,7 +13,7 @@ DESCRIPTION="NetEffect RNIC Userspace Library"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 

diff --git a/sys-infiniband/librdmacm/ChangeLog b/sys-infiniband/librdmacm/ChangeLog
deleted file mode 100644
index cfceadc..0000000
--- a/sys-infiniband/librdmacm/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-# ChangeLog for sys-infiniband/librdmacm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jun 2010; Kacper Kowalik <xarthisius@g.o>
-  librdmacm-1.0.8-r1.ebuild, +files/librdmacm-1.0.8-pcfile.patch:
-  adding pc file
-
-*librdmacm-1.0.8-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o>
-  +librdmacm-1.0.8-r1.ebuild:
-  Version Bump
-
-  16 Aug 2009; Alexey Shvetsov <alexxy@g.o> librdmacm-1.0.8.ebuild:
-  Add libibverbs to depend
-
-*librdmacm-1.0.8 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> +librdmacm-1.0.8.ebuild:
-  Version bump
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added ~x86 keyword, fixed copyright date
-
-*librdmacm-1.0.7 (13 May 2008)
-  13 May 2008; Bryan Green <bryan.d.green@××××.gov>
-  +librdmacm-1.0.7.ebuild: added
-
-*librdmacm-1.0.3 (26 Nov 2007)
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov>
-  -librdmacm-1.1.ebuild: removed
-  +librdmacm-1.0.3.ebuild: added
-
-*librdmacm-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/librdmacm/files/librdmacm-1.0.8-pcfile.patch b/sys-infiniband/librdmacm/files/librdmacm-1.0.8-pcfile.patch
deleted file mode 100644
index 70a75d3..0000000
--- a/sys-infiniband/librdmacm/files/librdmacm-1.0.8-pcfile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.in.orig	2010-06-22 14:29:13.162433883 +0200
-+++ configure.in	2010-06-22 14:30:08.453433847 +0200
-@@ -27,6 +27,17 @@
-         fi
- ])
- 
-+dnl Additional arguments (and substitutions)
-+dnl Allow the pkg-config directory to be set
-+AC_ARG_WITH(pkgconfigdir,
-+        AC_HELP_STRING([--with-pkgconfigdir],
-+        [Use the specified pkgconfig dir (default is libdir/pkgconfig)]),
-+        [pkgconfigdir=${withval}],
-+        [pkgconfigdir='${libdir}/pkgconfig'])
-+
-+AC_SUBST([pkgconfigdir])
-+AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
-+
- dnl Checks for programs
- AC_PROG_CC
- 
-@@ -62,5 +73,5 @@
- 
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
- 
--AC_CONFIG_FILES([Makefile librdmacm.spec])
-+AC_CONFIG_FILES([Makefile librdmacm.spec rdmacm.pc:rdmacm.pc.in])
- AC_OUTPUT
---- Makefile.am.orig	2010-06-22 14:29:17.849433892 +0200
-+++ Makefile.am	2010-06-22 14:30:30.680832953 +0200
-@@ -1,5 +1,8 @@
- INCLUDES = -I$(srcdir)/include
- 
-+pkgconfigdir = @pkgconfigdir@
-+pkgconfig_DATA = rdmacm.pc
-+
- lib_LTLIBRARIES = src/librdmacm.la
- 
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE
---- /dev/null	2010-05-29 13:22:18.914064236 +0200
-+++ rdmacm.pc.in	2010-06-22 14:30:56.082443278 +0200
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Version: @PACKAGE_VERSION@
-+Description: @PACKAGE_STRING@
-+Requires:
-+Libs: -L${libdir} -lrdmacm
-+Cflags: -I${includedir}

diff --git a/sys-infiniband/librdmacm/librdmacm-1.0.8-r1.ebuild b/sys-infiniband/librdmacm/librdmacm-1.0.14.1.ebuild
similarity index 57%
rename from sys-infiniband/librdmacm/librdmacm-1.0.8-r1.ebuild
rename to sys-infiniband/librdmacm/librdmacm-1.0.14.1.ebuild
index 22c05de..e350b7d 100644
--- a/sys-infiniband/librdmacm/librdmacm-1.0.8-r1.ebuild
+++ b/sys-infiniband/librdmacm/librdmacm-1.0.14.1.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
-inherit autotools eutils openib
+inherit eutils openib
 
 DESCRIPTION="OpenIB userspace RDMA CM library"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND="sys-infiniband/libibverbs"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pcfile.patch
-	eautoreconf
-}
-
 src_install() {
 	emake DESTDIR="${D}" install ||
 	dodoc README AUTHORS ChangeLog || die

diff --git a/sys-infiniband/librdmacm/librdmacm-1.0.8.ebuild b/sys-infiniband/librdmacm/librdmacm-1.0.8.ebuild
deleted file mode 100644
index 9d21fd3..0000000
--- a/sys-infiniband/librdmacm/librdmacm-1.0.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB userspace RDMA CM library"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="sys-infiniband/libibverbs"
-RDEPEND="${DEPEND}
-	!sys-infiniband/openib-userspace"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sys-infiniband/libsdp/ChangeLog b/sys-infiniband/libsdp/ChangeLog
deleted file mode 100644
index 0f1bc3d..0000000
--- a/sys-infiniband/libsdp/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-# ChangeLog for sys-infiniband/libsdp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jun 2011; Justin Lecher <jlec@g.o> libsdp-1.1.99.ebuild,
-  libsdp-1.1.99-r1.ebuild, metadata.xml:
-  Cleaned ebuild
-
-*libsdp-1.1.99-r1 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o> +libsdp-1.1.99-r1.ebuild:
-  Version Bump
-
-  09 Jul 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  removed libsdp-1.1.ebuild
-  added libsdp-1.1.99.ebuild
-
-*libsdp-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/libsdp/libsdp-1.1.99-r1.ebuild b/sys-infiniband/libsdp/libsdp-1.1.108.ebuild
similarity index 80%
rename from sys-infiniband/libsdp/libsdp-1.1.99-r1.ebuild
rename to sys-infiniband/libsdp/libsdp-1.1.108.ebuild
index 519ddca..1a26344 100644
--- a/sys-infiniband/libsdp/libsdp-1.1.99-r1.ebuild
+++ b/sys-infiniband/libsdp/libsdp-1.1.108.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="0.15.gd7fdb72"
 
 inherit openib
 

diff --git a/sys-infiniband/libsdp/libsdp-1.1.99.ebuild b/sys-infiniband/libsdp/libsdp-1.1.99.ebuild
deleted file mode 100644
index ead00d2..0000000
--- a/sys-infiniband/libsdp/libsdp-1.1.99.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="Socket Direct Protocol for unmodified applications"
-KEYWORDS="~amd64 ~x86"
-IUSE=""

diff --git a/sys-infiniband/openib-diags/ChangeLog b/sys-infiniband/openib-diags/ChangeLog
deleted file mode 100644
index bf02425..0000000
--- a/sys-infiniband/openib-diags/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-# ChangeLog for sys-infiniband/openib-diags
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jun 2011; Justin Lecher <jlec@g.o>
-  openib-diags-1.4.4_p20081207.ebuild, openib-diags-1.4.4_p20090314.ebuild,
-  metadata.xml:
-  Cleaned ebuild
-
-*openib-diags-1.4.4_p20090314 (20 Aug 2009)
-
-  20 Aug 2009; Alexey Shvetsov <alexxy@g.o>
-  +openib-diags-1.4.4_p20090314.ebuild:
-  Version Bump
-
-  19 Mar 2009; Alexey Shvetsov <alexxy@g.o>
-  +files/openib-diags-1.4.4_p20081207-remove-osmv.patch,
-  openib-diags-1.4.4_p20081207.ebuild:
-  add patch
-
-*openib-diags-1.4.4_p20081207 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o>
-  -openib-diags-1.3.2.ebuild, -openib-diags-1.4.0.ebuild,
-  +openib-diags-1.4.4_p20081207.ebuild:
-  Version bump
-
-*openib-diags-1.4.0 (06 Jun 2008)
-
-  06 Jun 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added openib-diags-1.4.0
-
-*openib-diags-1.3.2 (27 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  converted to standalone package
-  -openib-diags-1.1.ebuild: removed
-  +openib-diags-1.3.2.ebuild: added
-
-*openib-diags-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/openib-diags/files/openib-diags-1.4.4_p20081207-remove-osmv.patch b/sys-infiniband/openib-diags/files/openib-diags-1.4.4_p20081207-remove-osmv.patch
deleted file mode 100644
index 497a69d..0000000
--- a/sys-infiniband/openib-diags/files/openib-diags-1.4.4_p20081207-remove-osmv.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-diff --git a/infiniband-diags/configure.in b/infiniband-diags/configure.in
-index 58eea0a..7d277b2 100644
---- a/infiniband-diags/configure.in
-+++ b/infiniband-diags/configure.in
-@@ -40,10 +40,6 @@ AC_CHECK_LIB(ibmad, port_performance_ext_query, [],
- 	AC_MSG_ERROR([port_performance_ext_query() not found. diags require more recent libibmad.]))
- AC_CHECK_LIB(osmcomp, cl_thread_init, [],
- 	AC_MSG_ERROR([cl_thread_init() not found. diags require libosmcomp.]))
--AC_CHECK_LIB(osmvendor, osmv_query_sa, [],
--	AC_MSG_ERROR([osmv_query_sa() not found. diags require libosmvendor.]), [-lopensm])
--AC_CHECK_LIB(opensm, osm_log_init_v2, [],
--	AC_MSG_ERROR([osm_log_init_v2() not found. diags require libopensm.]))
- fi
- 
- dnl Checks for header files.
-diff --git a/infiniband-diags/src/saquery.c b/infiniband-diags/src/saquery.c
-index 5361184..0a997cf 100644
---- a/infiniband-diags/src/saquery.c
-+++ b/infiniband-diags/src/saquery.c
-@@ -42,20 +42,33 @@
- #include <arpa/inet.h>
- #include <ctype.h>
- #include <string.h>
-+#include <errno.h>
- 
- #define _GNU_SOURCE
- #include <getopt.h>
- 
-+#include <infiniband/umad.h>
- #include <infiniband/mad.h>
--#include <infiniband/opensm/osm_log.h>
--#include <infiniband/vendor/osm_vendor_api.h>
--#include <infiniband/vendor/osm_vendor_sa_api.h>
--#include <infiniband/opensm/osm_mad_pool.h>
-+#include <infiniband/iba/ib_types.h>
- #include <infiniband/complib/cl_debug.h>
- #include <infiniband/complib/cl_nodenamemap.h>
- 
- #include "ibdiag_common.h"
- 
-+struct sa_bind_handle {
-+	int fd, agent;
-+	ib_portid_t dport;
-+};
-+
-+struct sa_result {
-+	int status;
-+	unsigned result_cnt;
-+	void *p_result_madw;
-+};
-+
-+#define osmv_query_res_t struct sa_result
-+#define osm_bind_handle_t struct sa_bind_handle *
-+
- struct query_params {
- 	ib_gid_t sgid, dgid, gid, mgid;
- 	uint16_t slid, dlid, mlid;
-@@ -82,7 +95,7 @@ struct query_cmd {
- 
- static char *node_name_map_file = NULL;
- static nn_map_t *node_name_map = NULL;
--static ib_net64_t smkey = OSM_DEFAULT_SA_KEY;
-+static ib_net64_t smkey = CL_HTON64(1);
- 
- /**
-  * Declare some globals because I don't want this to be too complex.
-@@ -90,11 +103,6 @@ static ib_net64_t smkey = OSM_DEFAULT_SA_KEY;
- #define MAX_PORTS (8)
- #define DEFAULT_SA_TIMEOUT_MS (1000)
- osmv_query_res_t result;
--osm_log_t log_osm;
--osm_mad_pool_t mad_pool;
--osm_vendor_t *vendor = NULL;
--char *sa_hca_name = NULL;
--uint32_t sa_port_num = 0;
- 
- enum {
- 	ALL,
-@@ -112,6 +120,81 @@ int requested_lid_flag = 0;
- ib_net64_t requested_guid = 0;
- int requested_guid_flag = 0;
- 
-+static int sa_query(struct sa_bind_handle *h, uint8_t method,
-+		    ib_net16_t attr, ib_net32_t mod, ib_net64_t comp_mask,
-+		    ib_net64_t sm_key, void *data)
-+{
-+	ib_rpc_t rpc;
-+	void *umad, *mad;
-+	int ret, offset, len = 256;
-+
-+	memset(&rpc, 0, sizeof(rpc));
-+	rpc.mgtclass = IB_SA_CLASS;
-+	rpc.method = method;
-+	rpc.attr.id = cl_ntoh16(attr);
-+	rpc.attr.mod = cl_ntoh32(mod);
-+	rpc.mask = cl_ntoh64(comp_mask);
-+	rpc.datasz = IB_SA_DATA_SIZE;
-+	rpc.dataoffs = IB_SA_DATA_OFFS;
-+
-+	umad = calloc(1, len + umad_size());
-+	if (!umad)
-+		IBPANIC("cannot alloc mem for umad: %s\n", strerror(errno));
-+
-+	mad_build_pkt(umad, &rpc, &h->dport, NULL, data);
-+
-+	/* SA SM_Key (36/8) - temporary done using IB_MAD_MKEY_F */
-+	mad_set_field64(umad_get_mad(umad), 12, IB_MAD_MKEY_F, cl_hton64(sm_key));
-+
-+	if (ibdebug > 1)
-+		xdump(stdout, "SA Request:\n", umad_get_mad(umad), len);
-+
-+	ret = umad_send(h->fd, h->agent, umad, len, ibd_timeout, 0);
-+	if (ret < 0)
-+		IBPANIC("umad_send failed: attr %u: %s\n",
-+			attr, strerror(errno));
-+
-+recv_mad:
-+	ret = umad_recv(h->fd, umad, &len, ibd_timeout);
-+	if (ret < 0) {
-+		if (errno == ENOSPC) {
-+			umad = realloc(umad, umad_size() + len);
-+			goto recv_mad;
-+		}
-+		IBPANIC("umad_recv failed: attr %u: %s\n", attr,
-+			strerror(errno));
-+	}
-+
-+	if ((ret = umad_status(umad)))
-+		return ret;
-+
-+	mad = umad_get_mad(umad);
-+
-+	if (ibdebug > 1)
-+		xdump(stdout, "SA Response:\n", mad, len);
-+
-+	method = mad_get_field(mad, 0, IB_MAD_METHOD_F);
-+	offset = mad_get_field(mad, 0, IB_SA_ATTROFFS_F);
-+	result.status = mad_get_field(mad, 0, IB_MAD_STATUS_F);
-+	result.p_result_madw = mad;
-+	if (result.status || !offset)
-+		result.result_cnt = 0;
-+	else if (method != IB_MAD_METHOD_GET_TABLE)
-+		result.result_cnt = 1;
-+	else
-+		result.result_cnt = (len - IB_SA_DATA_OFFS) / (offset << 3);
-+
-+	return 0;
-+}
-+
-+static void *osmv_get_query_result(void *mad, unsigned i)
-+{
-+	int offset = mad_get_field(mad, 0, IB_SA_ATTROFFS_F);
-+	return mad + IB_SA_DATA_OFFS + i * (offset << 3);
-+}
-+
-+#define osmv_get_query_node_rec(mad, i) osmv_get_query_result(mad, i)
-+
- static unsigned valid_gid(ib_gid_t *gid)
- {
- 	ib_gid_t zero_gid = { };
-@@ -132,14 +215,6 @@ static void format_buf(char *in, char *out, unsigned size)
- 	*out = '\0';
- }
- 
--/**
-- * Call back for the various record requests.
-- */
--static void query_res_cb(osmv_query_res_t * res)
--{
--	result = *res;
--}
--
- static void print_node_desc(ib_node_record_t * node_record)
- {
- 	ib_node_info_t *p_ni = &(node_record->node_info);
-@@ -683,6 +758,7 @@ static void dump_one_mft_record(void *data)
- 		       cl_ntoh16(mftr->mft[i]));
- 	printf("\n");
- }
-+
- static void dump_results(osmv_query_res_t * r, void (*dump_func) (void *))
- {
- 	int i;
-@@ -694,11 +770,8 @@ static void dump_results(osmv_query_res_t * r, void (*dump_func) (void *))
- 
- static void return_mad(void)
- {
--	/*
--	 * Return the IB query MAD to the pool as necessary.
--	 */
--	if (result.p_result_madw != NULL) {
--		osm_mad_pool_put(&mad_pool, result.p_result_madw);
-+	if (result.p_result_madw) {
-+		free(result.p_result_madw - umad_size());
- 		result.p_result_madw = NULL;
- 	}
- }
-@@ -711,32 +784,11 @@ get_any_records(osm_bind_handle_t h,
- 		ib_net16_t attr_id, ib_net32_t attr_mod, ib_net64_t comp_mask,
- 		void *attr, ib_net16_t attr_offset, ib_net64_t sm_key)
- {
--	ib_api_status_t status;
--	osmv_query_req_t req;
--	osmv_user_query_t user;
--
--	memset(&req, 0, sizeof(req));
--	memset(&user, 0, sizeof(user));
--
--	user.attr_id = attr_id;
--	user.attr_offset = attr_offset;
--	user.attr_mod = attr_mod;
--	user.comp_mask = comp_mask;
--	user.p_attr = attr;
--
--	req.query_type = OSMV_QUERY_USER_DEFINED;
--	req.timeout_ms = ibd_timeout;
--	req.retry_cnt = 1;
--	req.flags = OSM_SA_FLAGS_SYNC;
--	req.query_context = NULL;
--	req.pfn_query_cb = query_res_cb;
--	req.p_query_input = &user;
--	req.sm_key = sm_key;
--
--	if ((status = osmv_query_sa(h, &req)) != IB_SUCCESS) {
--		fprintf(stderr, "Query SA failed: %s\n",
--			ib_get_err_str(status));
--		return status;
-+	int ret = sa_query(h, IB_MAD_METHOD_GET_TABLE, attr_id, attr_mod,
-+			   comp_mask, sm_key, attr);
-+	if (ret) {
-+		fprintf(stderr, "Query SA failed: %s\n", ib_get_err_str(ret));
-+		return ret;
- 	}
- 
- 	if (result.status != IB_SUCCESS) {
-@@ -745,7 +797,7 @@ get_any_records(osm_bind_handle_t h,
- 		return result.status;
- 	}
- 
--	return status;
-+	return ret;
- }
- 
- /**
-@@ -928,34 +980,21 @@ static ib_api_status_t print_node_records(osm_bind_handle_t h)
- 
- static ib_api_status_t get_print_class_port_info(osm_bind_handle_t h)
- {
--	osmv_query_req_t req;
--	ib_api_status_t status;
--
--	memset(&req, 0, sizeof(req));
--
--	req.query_type = OSMV_QUERY_CLASS_PORT_INFO;
--	req.timeout_ms = ibd_timeout;
--	req.retry_cnt = 1;
--	req.flags = OSM_SA_FLAGS_SYNC;
--	req.query_context = NULL;
--	req.pfn_query_cb = query_res_cb;
--	req.p_query_input = NULL;
--	req.sm_key = 0;
--
--	if ((status = osmv_query_sa(h, &req)) != IB_SUCCESS) {
-+	int ret = sa_query(h, IB_MAD_METHOD_GET, IB_MAD_ATTR_CLASS_PORT_INFO,
-+			   0, 0, 0, NULL);
-+	if (ret) {
- 		fprintf(stderr, "ERROR: Query SA failed: %s\n",
--			ib_get_err_str(status));
--		return (status);
-+			ib_get_err_str(ret));
-+		return ret;
- 	}
- 	if (result.status != IB_SUCCESS) {
- 		fprintf(stderr, "ERROR: Query result returned: %s\n",
- 			ib_get_err_str(result.status));
- 		return (result.status);
- 	}
--	status = result.status;
- 	dump_results(&result, dump_class_port_info);
- 	return_mad();
--	return (status);
-+	return ret;
- }
- 
- static int query_path_records(const struct query_cmd *q, osm_bind_handle_t h,
-@@ -1046,11 +1085,8 @@ static ib_api_status_t print_multicast_member_records(osm_bind_handle_t h)
- 	return_mad();
- 
- return_mc:
--	/* return_mad for the mc_group_result */
--	if (mc_group_result.p_result_madw != NULL) {
--		osm_mad_pool_put(&mad_pool, mc_group_result.p_result_madw);
--		mc_group_result.p_result_madw = NULL;
--	}
-+	if (mc_group_result.p_result_madw)
-+		free(mc_group_result.p_result_madw - umad_size());
- 
- 	return (status);
- }
-@@ -1366,78 +1402,30 @@ static int query_mft_records(const struct query_cmd *q, osm_bind_handle_t h,
- 
- static osm_bind_handle_t get_bind_handle(void)
- {
--	uint32_t i = 0;
--	uint64_t port_guid = (uint64_t) - 1;
--	osm_bind_handle_t h;
--	ib_api_status_t status;
--	ib_port_attr_t attr_array[MAX_PORTS];
--	uint32_t num_ports = MAX_PORTS;
--	uint32_t ca_name_index = 0;
--
--	complib_init();
--
--	osm_log_construct(&log_osm);
--	if ((status = osm_log_init_v2(&log_osm, TRUE, 0x0001, NULL,
--				      0, TRUE)) != IB_SUCCESS) {
--		fprintf(stderr, "Failed to init osm_log: %s\n",
--			ib_get_err_str(status));
--		exit(-1);
--	}
--	osm_log_set_level(&log_osm, OSM_LOG_NONE);
--	if (ibdebug)
--		osm_log_set_level(&log_osm, OSM_LOG_DEFAULT_LEVEL);
--
--	vendor = osm_vendor_new(&log_osm, ibd_timeout);
--	osm_mad_pool_construct(&mad_pool);
--	if ((status = osm_mad_pool_init(&mad_pool)) != IB_SUCCESS) {
--		fprintf(stderr, "Failed to init mad pool: %s\n",
--			ib_get_err_str(status));
--		exit(-1);
--	}
-+	static struct sa_bind_handle handle;
-+	int mgmt_classes[2] = { IB_SMI_CLASS, IB_SMI_DIRECT_CLASS };
- 
--	if ((status =
--	     osm_vendor_get_all_port_attr(vendor, attr_array,
--					  &num_ports)) != IB_SUCCESS) {
--		fprintf(stderr, "Failed to get port attributes: %s\n",
--			ib_get_err_str(status));
--		exit(-1);
--	}
-+	madrpc_init(ibd_ca, ibd_ca_port, mgmt_classes, 2);
- 
--	for (i = 0; i < num_ports; i++) {
--		if (i > 1 && cl_ntoh64(attr_array[i].port_guid)
--		    != (cl_ntoh64(attr_array[i - 1].port_guid) + 1))
--			ca_name_index++;
--		if (sa_port_num && sa_port_num != attr_array[i].port_num)
--			continue;
--		if (sa_hca_name
--		    && strcmp(sa_hca_name,
--			      vendor->ca_names[ca_name_index]) != 0)
--			continue;
--		if (attr_array[i].link_state == IB_LINK_ACTIVE) {
--			port_guid = attr_array[i].port_guid;
--			break;
--		}
--	}
-+	ib_resolve_smlid(&handle.dport, ibd_timeout);
-+	if (!handle.dport.lid)
-+		IBPANIC("No SM found.");
- 
--	if (port_guid == (uint64_t) - 1) {
--		fprintf(stderr,
--			"Failed to find active port, check port status with \"ibstat\"\n");
--		exit(-1);
--	}
-+	handle.dport.qp = 1;
-+	if (!handle.dport.qkey)
-+		handle.dport.qkey = IB_DEFAULT_QP1_QKEY;
- 
--	h = osmv_bind_sa(vendor, &mad_pool, port_guid);
-+	handle.fd = madrpc_portid();
-+	handle.agent = umad_register(handle.fd, IB_SA_CLASS, 2, 1, NULL);
- 
--	if (h == OSM_BIND_INVALID_HANDLE) {
--		fprintf(stderr, "Failed to bind to SA\n");
--		exit(-1);
--	}
--	return h;
-+	return &handle;
- }
- 
--static void clean_up(void)
-+static void clean_up(struct sa_bind_handle *h)
- {
--	osm_mad_pool_destroy(&mad_pool);
--	osm_vendor_delete(&vendor);
-+	umad_unregister(h->fd, h->agent);
-+	umad_close_port(h->fd);
-+	umad_done();
- }
- 
- static const struct query_cmd query_cmds[] = {
-@@ -1847,7 +1835,7 @@ int main(int argc, char **argv)
- 
- 	if (src_lid)
- 		free(src_lid);
--	clean_up();
-+	clean_up(h);
- 	close_node_name_map(node_name_map);
- 	return (status);
- }

diff --git a/sys-infiniband/openib-diags/openib-diags-1.4.4_p20081207.ebuild b/sys-infiniband/openib-diags/openib-diags-1.4.4_p20081207.ebuild
deleted file mode 100644
index 2347d71..0000000
--- a/sys-infiniband/openib-diags/openib-diags-1.4.4_p20081207.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB diagnostic programs and scripts needed to diagnose an IB subnet"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	=sys-infiniband/libibcommon-1.1.2_p20081020
-	>=sys-infiniband/libibumad-1.2.3_p20081118
-	>=sys-infiniband/libibmad-1.2.3_p20081118
-	>=sys-infiniband/openib-osm-3.2.5_p20081207"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-remove-osmv.patch" )

diff --git a/sys-infiniband/openib-files/openib-files-1.4.ebuild b/sys-infiniband/openib-files/openib-files-1.4.ebuild
deleted file mode 100644
index 5910853..0000000
--- a/sys-infiniband/openib-files/openib-files-1.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-OFED_VER="1.4"
-OFED_SUFFIX="ofed1.4"
-
-inherit openib
-
-DESCRIPTION="OpenIB system files"
-SCRIPTDIR="${S}/ofed_scripts"
-KEYWORDS="~x86 ~amd64"
-IUSE="ehca ipath iser mlx4 rds srp vnic"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	einfo "Nothing to configure"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	insinto /etc/udev/rules.d
-	newins "${SCRIPTDIR}/90-ib.rules" 40-ib.rules
-	insinto /etc/modules.d
-	newins "${FILESDIR}/openib.modprobe.${PV}" openib
-	newenvd "${FILESDIR}/openib.env" 02openib
-	insinto /etc/infiniband
-
-	doinitd "${FILESDIR}/openib"
-
-	# build openib.conf based on ofed_scripts/ofa_kernel.spec
-	build_ipoib=1
-	build_sdp=1
-	cp "${SCRIPTDIR}/openib.conf" "${T}"
-	IB_CONF_DIR=${T}
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "UCM_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_CM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_CM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_UCM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Increase ib_mad thread priority" >> ${IB_CONF_DIR}/openib.conf
-	echo "RENICE_IB_MAD=no" >> ${IB_CONF_DIR}/openib.conf
-
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load MTHCA" >> ${IB_CONF_DIR}/openib.conf
-	echo "MTHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	if use ipath; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPATH" >> ${IB_CONF_DIR}/openib.conf
-		echo "IPATH_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use ehca; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load eHCA" >> ${IB_CONF_DIR}/openib.conf
-		echo "EHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use mlx4; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load MLX4 modules" >> ${IB_CONF_DIR}/openib.conf
-		echo "MLX4_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_ipoib )); then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPoIB" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIB_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB Connected Mode" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SET_IPOIB_CM=yes" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIBHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-		echo "# PRIMARY_IPOIB_DEV=ib0" >> ${IB_CONF_DIR}/openib.conf
-		echo "# SECONDARY_IPOIB_DEV=ib1" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_sdp )); then
-		 echo >> ${IB_CONF_DIR}/openib.conf
-		 echo "# Load SDP module" >> ${IB_CONF_DIR}/openib.conf
-		 echo "#SDP_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use srp; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load SRP module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRP_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable SRP High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRPHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-
-	fi
-	if use iser; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load ISER module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#ISER_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use rds; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load RDS module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#RDS_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use vnic; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load VNIC module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#VNIC_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-
-	doins "${T}/openib.conf"
-}
-
-pkg_postinst() {
-	einfo "Configuration file installed in /etc/infiniband/openib.conf"
-	einfo "To automatically initialize infiniband on boot, add openib to your"
-	einfo "start-up scripts, like so:"
-	einfo "\`rc-update add openib default\`"
-
-}

diff --git a/sys-infiniband/openib-files/openib-files-1.4.1.ebuild b/sys-infiniband/openib-files/openib-files-1.5.3.1.ebuild
similarity index 97%
rename from sys-infiniband/openib-files/openib-files-1.4.1.ebuild
rename to sys-infiniband/openib-files/openib-files-1.5.3.1.ebuild
index 1878890..dbd6c80 100644
--- a/sys-infiniband/openib-files/openib-files-1.4.1.ebuild
+++ b/sys-infiniband/openib-files/openib-files-1.5.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
-OFED_SUFFIX="ofed1.4.1"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="OFED.1.5.3.1."
 
 inherit openib
 

diff --git a/sys-infiniband/openib-mvapich2/ChangeLog b/sys-infiniband/openib-mvapich2/ChangeLog
deleted file mode 100644
index 993841b..0000000
--- a/sys-infiniband/openib-mvapich2/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-# ChangeLog for sys-infiniband/openib-mvapich2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  24 Jun 2011; Justin Lecher <jlec@g.o> openib-mvapich2-0.9.5.ebuild,
-  openib-mvapich2-0.9.6.ebuild, openib-mvapich2-1.0.ebuild,
-  openib-mvapich2-1.0.1.ebuild, openib-mvapich2-1.0.1-r1.ebuild:
-  Fix repoman warnings
-
-  21 Jun 2011; Justin Lecher <jlec@g.o> openib-mvapich2-0.9.5.ebuild,
-  openib-mvapich2-0.9.6.ebuild, openib-mvapich2-1.0.ebuild,
-  openib-mvapich2-1.0.1.ebuild, openib-mvapich2-1.0.1-r1.ebuild:
-  Added fortran-2.eclass support
-
-  16 Dec 2010; Justin Lecher <jlec@g.o> openib-mvapich2-1.0.1-r1.ebuild:
-  Removal of fortran.eclass, #348851
-
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  minor fix, added use of ${mpi_conf_args}
-
-*openib-mvapich2-1.0.1-r1 (28 May 2008)
-  28 May 2008; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  added 1.0.1-r1 per Bug 219368
-  fixed copyright dates
-  +openib-mvapich2-1.0.1-r1.ebuild: added
-  +files/eselect.mpi.mvapich2: added
-
-*openib-mvapich2-1.0.1 (26 Nov 2007)
-*openib-mvapich2-1.0 (26 Nov 2007)
-
-  27 Nov 2007; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Version bump to 1.0.1
-  +openib-mvapich2-1.0.ebuild: added
-  +openib-mvapich2-1.0.1.ebuild: added
-
-*openib-mvapich2-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/openib-mvapich2/files/eselect.mpi.mvapich2 b/sys-infiniband/openib-mvapich2/files/eselect.mpi.mvapich2
deleted file mode 100644
index d1d2131..0000000
--- a/sys-infiniband/openib-mvapich2/files/eselect.mpi.mvapich2
+++ /dev/null
@@ -1,8 +0,0 @@
-MPI_CC=@ROOT@/usr/bin/mpicc
-MPI_CXX=@ROOT@/usr/bin/mpic++
-MPI_F77=@ROOT@/usr/bin/mpif77
-MPI_F90=@ROOT@/usr/bin/mpif90
-MPI_BUILT_WITH=@BUILT_WITH@
-PATH=@ROOT@/usr/bin
-MANPATH=@ROOT@/usr/share/man
-LD_LIBRARY_PATH=@ROOT@/usr/@LIBDIR@

diff --git a/sys-infiniband/openib-mvapich2/metadata.xml b/sys-infiniband/openib-mvapich2/metadata.xml
deleted file mode 100644
index a5a0043..0000000
--- a/sys-infiniband/openib-mvapich2/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>cluster</herd>
-  <longdescription>
-MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
-</longdescription>
-  <use>
-    <flag name="large-cluster">Automatically generated description for large-cluster</flag>
-    <flag name="medium-cluster">Automatically generated description for medium-cluster</flag>
-    <flag name="rdma">Automatically generated description for rdma</flag>
-    <flag name="romio">Automatically generated description for romio</flag>
-  </use>
-</pkgmetadata>

diff --git a/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.5.ebuild b/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.5.ebuild
deleted file mode 100644
index 436fa50..0000000
--- a/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.5.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# WARNING: this script is interactive - it requires user-input once to verify
-# the type of HCA to configure for.  This needs to be fixed to take out the
-# interactivity.
-
-inherit fortran-2
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://nowlab.cse.ohio-state.edu/projects/mpi-iba/"
-SRC_URI="http://nowlab.cse.ohio-state.edu/projects/mpi-iba/download-mvapich2/mvapich2-$PV.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="debug large-cluster medium-cluster threads"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="
-	|| (
-		sys-infiniband/libibverbs
-		sys-infiniband/openib-userspace )
-	|| (
-		sys-infiniband/librdmacm
-		sys-infiniband/openib-userspace )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/mvapich2-$PV"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	ARCH=
-	VCLUSTER=_SMALL_CLUSTER
-	HAVE_MPD_RING="-DUSE_MPD_RING"
-
-	if use amd64; then
-		if [ -n "`grep 'model name' </proc/cpuinfo |grep Intel`" ]; then
-			ARCH=_EM64T_
-		else
-			ARCH=_X86_64_
-		fi
-	elif use x86; then
-		ARCH=_IA32_
-	elif use ia64; then
-		ARCH=_IA64_
-	elif use ppc64; then
-		ARCH=_PPC64_
-	else
-		die "unsupported architecture"
-	fi
-}
-
-src_compile() {
-	if use large-cluster; then
-		VCLUSTER=_LARGE_CLUSTER
-	elif use medium-cluster; then
-		VCLUSTER=_MEDIUM_CLUSTER
-	fi
-
-	source "${S}/make.mvapich2.detect"
-
-	# Check if SRQ is valid. for this platform.
-	ENABLE_SRQ="-DSRQ"
-
-	if [ "$HCA_COMPILE_FLAG" == "_MLX_PCI_X_" ]; then
-		ENABLE_SRQ=""
-	fi
-
-	export LIBS="-libverbs -lpthread"
-	export CFLAGS="${CFLAGS} -D${ARCH} \
-		-DUSE_INLINE -D_SMP_ -DADAPTIVE_RDMA_FAST_PATH \
-		-D_GNU_SOURCE -DSRQ -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER \
-		-DONE_SIDED -D${HCA_COMPILE_FLAG} -DMPID_USE_SEQUENCE_NUMBERS \
-		${HAVE_MPD_RING} -D${VCLUSTER}"
-
-	local myconf
-	use debug && myconf="$myconf --enable-g=all --enable-debuginfo"
-	if [ $(use threads) ]; then
-		myconf="$myconf --enable-threads=multiple"
-	else
-		: # myconf="$myconf --enable-threads=serialized"
-	fi
-	sed -i -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
-		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' ./Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ./src/pm/mpd/Makefile.in
-	./configure \
-		--prefix=/opt/mvapich2-gen2 \
-		--host=${CHOST} \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-device=osu_ch3:mrail --with-rdma=gen2 --with-pm=mpd \
-		--disable-romio --without-mpe \
-		$myconf ${EXTRA_ECONF} \
-			|| die "could not configure"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	doenvd "${FILESDIR}/99openib-mvapich2"
-	dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
-		README* RELEASE_NOTES*
-}
-
-pkg_postinst() {
-	einfo "To allow normal users to use infiniband, it is necessary to"
-	einfo "increase the system limits on locked memory."
-	einfo "You must increase the kernel.shmmax sysctl value, and increase"
-	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
-	echo
-	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
-	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
-	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}

diff --git a/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.6.ebuild b/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.6.ebuild
deleted file mode 100644
index 436fa50..0000000
--- a/sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# WARNING: this script is interactive - it requires user-input once to verify
-# the type of HCA to configure for.  This needs to be fixed to take out the
-# interactivity.
-
-inherit fortran-2
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://nowlab.cse.ohio-state.edu/projects/mpi-iba/"
-SRC_URI="http://nowlab.cse.ohio-state.edu/projects/mpi-iba/download-mvapich2/mvapich2-$PV.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="debug large-cluster medium-cluster threads"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="
-	|| (
-		sys-infiniband/libibverbs
-		sys-infiniband/openib-userspace )
-	|| (
-		sys-infiniband/librdmacm
-		sys-infiniband/openib-userspace )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/mvapich2-$PV"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	ARCH=
-	VCLUSTER=_SMALL_CLUSTER
-	HAVE_MPD_RING="-DUSE_MPD_RING"
-
-	if use amd64; then
-		if [ -n "`grep 'model name' </proc/cpuinfo |grep Intel`" ]; then
-			ARCH=_EM64T_
-		else
-			ARCH=_X86_64_
-		fi
-	elif use x86; then
-		ARCH=_IA32_
-	elif use ia64; then
-		ARCH=_IA64_
-	elif use ppc64; then
-		ARCH=_PPC64_
-	else
-		die "unsupported architecture"
-	fi
-}
-
-src_compile() {
-	if use large-cluster; then
-		VCLUSTER=_LARGE_CLUSTER
-	elif use medium-cluster; then
-		VCLUSTER=_MEDIUM_CLUSTER
-	fi
-
-	source "${S}/make.mvapich2.detect"
-
-	# Check if SRQ is valid. for this platform.
-	ENABLE_SRQ="-DSRQ"
-
-	if [ "$HCA_COMPILE_FLAG" == "_MLX_PCI_X_" ]; then
-		ENABLE_SRQ=""
-	fi
-
-	export LIBS="-libverbs -lpthread"
-	export CFLAGS="${CFLAGS} -D${ARCH} \
-		-DUSE_INLINE -D_SMP_ -DADAPTIVE_RDMA_FAST_PATH \
-		-D_GNU_SOURCE -DSRQ -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER \
-		-DONE_SIDED -D${HCA_COMPILE_FLAG} -DMPID_USE_SEQUENCE_NUMBERS \
-		${HAVE_MPD_RING} -D${VCLUSTER}"
-
-	local myconf
-	use debug && myconf="$myconf --enable-g=all --enable-debuginfo"
-	if [ $(use threads) ]; then
-		myconf="$myconf --enable-threads=multiple"
-	else
-		: # myconf="$myconf --enable-threads=serialized"
-	fi
-	sed -i -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
-		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' ./Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ./src/pm/mpd/Makefile.in
-	./configure \
-		--prefix=/opt/mvapich2-gen2 \
-		--host=${CHOST} \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-device=osu_ch3:mrail --with-rdma=gen2 --with-pm=mpd \
-		--disable-romio --without-mpe \
-		$myconf ${EXTRA_ECONF} \
-			|| die "could not configure"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	doenvd "${FILESDIR}/99openib-mvapich2"
-	dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
-		README* RELEASE_NOTES*
-}
-
-pkg_postinst() {
-	einfo "To allow normal users to use infiniband, it is necessary to"
-	einfo "increase the system limits on locked memory."
-	einfo "You must increase the kernel.shmmax sysctl value, and increase"
-	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
-	echo
-	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
-	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
-	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}

diff --git a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild b/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild
deleted file mode 100644
index 083493b..0000000
--- a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit fortran-2 mpi
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
-SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug fortran large-cluster medium-cluster rdma romio threads"
-
-RDEPEND="
-	|| (
-		(
-			sys-infiniband/libibverbs
-			sys-infiniband/libibumad
-			sys-infiniband/libibmad
-			rdma? ( sys-infiniband/librdmacm ) )
-		sys-infiniband/openib-userspace )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mvapich2-${PV/_/-}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	MPI_ESELECT_FILE="eselect.mpi.mvapich2"
-
-	if [ -z "${MVAPICH_HCA_TYPE}" ]; then
-		elog "${PN} needs to know which HCA it should optimize for.  This is"
-		elog "passed to the ebuild with the variable, \${MVAPICH_HCA_TYPE}."
-		elog "Please choose one of:  _MLX_PCI_EX_SDR_, _MLX_PCI_EX_DDR_,"
-		elog "_MLX_PCI_X, _PATH_HT_, or _IBM_EHCA_."
-		elog "See make.mvapich2.detect in ${S} for more information."
-		die "MVAPICH_HCA_TYPE undefined"
-	fi
-
-	case ${ARCH} in
-		amd64)
-			if grep Intel /proc/cpuinfo &>/dev/null; then
-				BUILD_ARCH=-D_EM64T_
-			else
-				BUILD_ARCH=-D_X86_64_
-			fi
-			;;
-		x86)
-			BUILD_ARCH=-D_IA32_
-			;;
-		ia64)
-			BUILD_ARCH=-D_IA64_
-			;;
-		ppc64)
-			BUILD_ARCH=-D_PPC64_
-			;;
-		*)
-			die "unsupported architecture: ${ARCH}"
-			;;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	einfo "Disabling examples"
-	# Examples are always compiled with the default 'all' target.  This
-	# causes problems when we don't build support for everything, including
-	# threads, mpe2, etc.  So we're not going to build them.
-	sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
-}
-
-src_compile() {
-	local c="--with-device=osu_ch3:mrail
-		--with-rdma=gen2
-		--with-pm=mpd
-		$(use_enable romio)
-		--with-mpe=no"
-
-	# TODO Shared libs should build with this, but they don't
-	# --enable-shared=gcc"
-
-	local enable_srq
-	local vcluster=-D_SMALL_CLUSTER
-
-	use large-cluster 	&& vcluster=-D_LARGE_CLUSTER
-	use medium-cluster 	&& vcluster=-D_MEDIUM_CLUSTER
-	[ "${MVAPICH_HCA_TYPE}" == "_MLX_PCI_X_" ] && enable_srq="-DSRQ"
-
-	if use rdma; then
-		append-ldflags "-lrdmacm"
-		append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
-	fi
-	append-ldflags "-libverbs -libumad -libmad"
-
-	append-flags "${BUILD_ARCH} -DUSE_INLINE -D_SMP_ -D_GNU_SOURCE"
-	append-flags "${enable_srq} -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER"
-	append-flags "-DONE_SIDED -D${MVAPICH_HCA_TYPE} ${vcluster}"
-	append-flags "-DMPID_USE_SEQUENCE_NUMBERS -DUSE_MPD_RING"
-
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
-
-	if use threads; then
-		c="${c} --enable-threads=multiple --with-thread-package=pthreads"
-		append-flags "-pthread"
-	else
-		c="${c} --with-thread-package=none"
-	fi
-
-	# enable f90 support for appropriate compilers
-	if use fortran; then
-		case "$(tc-getFC)" in
-			gfortran|ifort|f95)
-				c="${c} --enable-f77 --enable-f90";;
-			g77|f77|f2c)
-				c="${c} --enable-f77 --disable-f90";;
-		esac
-	else
-		c="${c} --disable-f77 --disable-f90"
-	fi
-
-	sed -i \
-		-e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
-		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' \
-		${S/-beta2/}/Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
-	cd ${S/-beta2/}
-
-	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
-	econf $(mpi_econf_args)	${c}
-
-	# http://www.mcs.anl.gov/research/projects/mpich2/support/index.php?s=faqs#parmake
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-
-}
-
-src_install() {
-	emake  DESTDIR="${D}"|| die
-	mpi_dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
-		README* RELEASE_NOTES*
-	mpi_imp_add_eselect
-}
-
-pkg_postinst() {
-	einfo "To allow normal users to use infiniband, it is necessary to"
-	einfo "increase the system limits on locked memory."
-	einfo "You must increase the kernel.shmmax sysctl value, and increase"
-	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
-	echo
-	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
-	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
-	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}

diff --git a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1.ebuild b/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1.ebuild
deleted file mode 100644
index 734d8b8..0000000
--- a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit fortran-2
-
-# WARNING: this script is interactive - it requires user-input once to verify
-# the type of HCA to configure for.  This needs to be fixed to take out the
-# interactivity.
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
-SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="debug large-cluster medium-cluster rdma threads"
-
-RDEPEND="
-	|| (
-		(
-			sys-infiniband/libibverbs
-			sys-infiniband/libibumad
-			sys-infiniband/libibmad
-			rdma? ( sys-infiniband/librdmacm ) )
-		sys-infiniband/openib-userspace )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mvapich2-${PV/_/-}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	ARCH=
-	VCLUSTER=_SMALL_CLUSTER
-	HAVE_MPD_RING="-DUSE_MPD_RING"
-
-	if use amd64; then
-		if [ -n "`grep 'model name' </proc/cpuinfo |grep Intel`" ]; then
-			ARCH=_EM64T_
-		else
-			ARCH=_X86_64_
-		fi
-	elif use x86; then
-		ARCH=_IA32_
-	elif use ia64; then
-		ARCH=_IA64_
-	elif use ppc64; then
-		ARCH=_PPC64_
-	else
-		die "unsupported architecture"
-	fi
-}
-
-src_compile() {
-	if use large-cluster; then
-		VCLUSTER=_LARGE_CLUSTER
-	elif use medium-cluster; then
-		VCLUSTER=_MEDIUM_CLUSTER
-	fi
-
-	source ${S/-beta2/}/make.mvapich2.detect
-
-	# Check if SRQ is valid. for this platform.
-	ENABLE_SRQ="-DSRQ"
-
-	if [ "$HCA_COMPILE_FLAG" == "_MLX_PCI_X_" ]; then
-		ENABLE_SRQ=""
-	fi
-
-	export LIBS="-libverbs -lpthread -libumad -libmad"
-	if use rdma; then
-		export LIBS="${LIBS} -lrdmacm"
-		export CFLAGS="${CFLAGS} -DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
-	fi
-	export CFLAGS="${CFLAGS} -D${ARCH} \
-		-DUSE_INLINE -D_SMP_  \
-		-D_GNU_SOURCE -DSRQ -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER \
-		-DONE_SIDED -D${HCA_COMPILE_FLAG} -DMPID_USE_SEQUENCE_NUMBERS \
-		${HAVE_MPD_RING} -D${VCLUSTER}"
-
-	local myconf
-	use debug && myconf="$myconf --enable-g=all --enable-debuginfo"
-	use threads && myconf="$myconf --enable-threads=multiple"
-
-	sed -i -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
-		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' ${S/-beta2/}/Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
-	cd ${S/-beta2/}
-	econf \
-		--with-device=osu_ch3:mrail --with-rdma=gen2 --with-pm=mpd \
-		--disable-romio --without-mpe \
-		$myconf ${EXTRA_ECONF} \
-			|| die "could not configure"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
-		README* RELEASE_NOTES*
-}
-
-pkg_postinst() {
-	einfo "To allow normal users to use infiniband, it is necessary to"
-	einfo "increase the system limits on locked memory."
-	einfo "You must increase the kernel.shmmax sysctl value, and increase"
-	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
-	echo
-	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
-	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
-	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}

diff --git a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.ebuild b/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.ebuild
deleted file mode 100644
index 734d8b8..0000000
--- a/sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit fortran-2
-
-# WARNING: this script is interactive - it requires user-input once to verify
-# the type of HCA to configure for.  This needs to be fixed to take out the
-# interactivity.
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
-SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="debug large-cluster medium-cluster rdma threads"
-
-RDEPEND="
-	|| (
-		(
-			sys-infiniband/libibverbs
-			sys-infiniband/libibumad
-			sys-infiniband/libibmad
-			rdma? ( sys-infiniband/librdmacm ) )
-		sys-infiniband/openib-userspace )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mvapich2-${PV/_/-}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	ARCH=
-	VCLUSTER=_SMALL_CLUSTER
-	HAVE_MPD_RING="-DUSE_MPD_RING"
-
-	if use amd64; then
-		if [ -n "`grep 'model name' </proc/cpuinfo |grep Intel`" ]; then
-			ARCH=_EM64T_
-		else
-			ARCH=_X86_64_
-		fi
-	elif use x86; then
-		ARCH=_IA32_
-	elif use ia64; then
-		ARCH=_IA64_
-	elif use ppc64; then
-		ARCH=_PPC64_
-	else
-		die "unsupported architecture"
-	fi
-}
-
-src_compile() {
-	if use large-cluster; then
-		VCLUSTER=_LARGE_CLUSTER
-	elif use medium-cluster; then
-		VCLUSTER=_MEDIUM_CLUSTER
-	fi
-
-	source ${S/-beta2/}/make.mvapich2.detect
-
-	# Check if SRQ is valid. for this platform.
-	ENABLE_SRQ="-DSRQ"
-
-	if [ "$HCA_COMPILE_FLAG" == "_MLX_PCI_X_" ]; then
-		ENABLE_SRQ=""
-	fi
-
-	export LIBS="-libverbs -lpthread -libumad -libmad"
-	if use rdma; then
-		export LIBS="${LIBS} -lrdmacm"
-		export CFLAGS="${CFLAGS} -DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
-	fi
-	export CFLAGS="${CFLAGS} -D${ARCH} \
-		-DUSE_INLINE -D_SMP_  \
-		-D_GNU_SOURCE -DSRQ -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER \
-		-DONE_SIDED -D${HCA_COMPILE_FLAG} -DMPID_USE_SEQUENCE_NUMBERS \
-		${HAVE_MPD_RING} -D${VCLUSTER}"
-
-	local myconf
-	use debug && myconf="$myconf --enable-g=all --enable-debuginfo"
-	use threads && myconf="$myconf --enable-threads=multiple"
-
-	sed -i -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
-		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' ${S/-beta2/}/Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
-	cd ${S/-beta2/}
-	econf \
-		--with-device=osu_ch3:mrail --with-rdma=gen2 --with-pm=mpd \
-		--disable-romio --without-mpe \
-		$myconf ${EXTRA_ECONF} \
-			|| die "could not configure"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
-		README* RELEASE_NOTES*
-}
-
-pkg_postinst() {
-	einfo "To allow normal users to use infiniband, it is necessary to"
-	einfo "increase the system limits on locked memory."
-	einfo "You must increase the kernel.shmmax sysctl value, and increase"
-	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
-	echo
-	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
-	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
-	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}

diff --git a/sys-infiniband/openib-osm/files/openib-osm-3.2.6_p20090317-fix.patch b/sys-infiniband/openib-osm/files/openib-osm-3.2.6_p20090317-fix.patch
deleted file mode 100644
index 4f67e9b..0000000
--- a/sys-infiniband/openib-osm/files/openib-osm-3.2.6_p20090317-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/vendor/osm_vendor.h.orig	2009-08-20 21:48:00.320595396 +0400
-+++ include/vendor/osm_vendor.h	2009-08-20 21:47:22.386595263 +0400
-@@ -65,7 +65,7 @@
- #include <vendor/osm_vendor_ibumad.h>
- #elif defined( OSM_VENDOR_INTF_AL )
- #include <vendor/osm_vendor_al.h>
--#elif
-+#else
- #error No MAD Interface selected!
- #error Choose an interface in osm_config.h
- #endif

diff --git a/sys-infiniband/openib-osm/openib-osm-3.2.6_p20090317.ebuild b/sys-infiniband/openib-osm/openib-osm-3.2.6_p20090317.ebuild
deleted file mode 100644
index 2aa0616..0000000
--- a/sys-infiniband/openib-osm/openib-osm-3.2.6_p20090317.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-OFED_VER="1.4.1"
-OFED_SUFFIX="1.ofed1.4.1"
-
-inherit openib
-
-DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=sys-infiniband/libibmad-1.2.3_p20090314
-	>=sys-infiniband/libibumad-1.2.3_p20090314"
-RDEPEND="$DEPEND
-	 sys-infiniband/openib-files
-	 net-misc/iputils"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix.patch"
-}
-
-src_configure() {
-	econf \
-		--enable-perf-mgr \
-		--enable-default-event-plugin \
-		--with-osmv="openib"
-}
-
-src_install() {
-	default
-	newconfd "${S}/scripts/opensm.sysconfig" opensm
-	newinitd "${FILESDIR}/opensm.init.d" opensm
-	insinto /etc/logrotate.d
-	newins "${S}/scripts/opensm.logrotate" opensm
-	# we dont nee this int script
-	rm "${D}/etc/init.d/opensmd" || die "Dropping of upstream initscript failed"
-}
-
-pkg_postinst() {
-	einfo "To automatically configure the infiniband subnet manager on boot,"
-	einfo "edit /etc/opensm.conf and add opensm to your start-up scripts:"
-	einfo "\`rc-update add opensm default\`"
-}

diff --git a/sys-infiniband/openib-perf/ChangeLog b/sys-infiniband/openib-perf/ChangeLog
deleted file mode 100644
index a46004e..0000000
--- a/sys-infiniband/openib-perf/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for sys-infiniband/openib-perf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jun 2011; Justin Lecher <jlec@g.o> openib-perf-1.2.ebuild,
-  metadata.xml:
-  RDEPEND is not explicitly assigned -> fixed
-
-*openib-perf-1.2 (21 Jan 2009)
-
-  21 Jan 2009; Alexey Shvetsov <alexxy@g.o> -openib-perf-1.1.ebuild,
-  +openib-perf-1.2.ebuild:
-  Version bump
-
-*openib-perf-1.1 (26 Oct 2006)
-
-  26 Oct 2006; Bryan Green <bryan.d.green@××××.gov> ChangeLog:
-  Initial Import
-

diff --git a/sys-infiniband/openib-srptools/openib-srptools-1.1.ebuild b/sys-infiniband/openib-srptools/openib-srptools-1.1.ebuild
deleted file mode 100644
index 2ef2575..0000000
--- a/sys-infiniband/openib-srptools/openib-srptools-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Tools for discovering and connecting to SRP CSI targets on InfiniBand fabrics"
-HOMEPAGE="http://www.openfabrics.org/"
-#SRC_URI="http://www.openfabrics.org/downloads/openib-userspace-${PV}.tgz"
-SRC_URI="http://mirror.gentooscience.org/openib-userspace-${PV}.tgz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}/openib-userspace-${PV}/src/userspace/${PN}"

diff --git a/sys-infiniband/openib-userspace/openib-userspace-1.2.5.1-r1.ebuild b/sys-infiniband/openib-userspace/openib-userspace-1.2.5.1-r1.ebuild
deleted file mode 100644
index 0c98438..0000000
--- a/sys-infiniband/openib-userspace/openib-userspace-1.2.5.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit rpm
-
-SHORT_PV=${PV%\.[^.]}
-MY_P="OFED-${PV}"
-OSM="${S}/src/userspace/management/osm"
-
-DESCRIPTION="OpenFabrics userspace libraries and utilities"
-HOMEPAGE="http://www.openfabrics.org/"
-SRC_URI="http://www.openfabrics.org/builds/ofed-${SHORT_PV}/release/OFED-${PV}.tgz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~x86 ~amd64"
-IUSE="cxgb3 dapl ehca ipath mstflint opensm qlvnictools srptools tvflash"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<=sys-infiniband/openib-drivers-1.2
-	!sys-infiniband/libibverbs
-	!sys-infiniband/libmthca
-	!sys-infiniband/libipathverbs
-	!sys-infiniband/librdmacm
-	!sys-infiniband/libsdp
-	!sys-infiniband/dapl
-	!sys-infiniband/libehca
-	!sys-infiniband/libibcm
-	!sys-infiniband/libibcommon
-	!sys-infiniband/libibmad
-	!sys-infiniband/libibumad
-	!sys-infiniband/openib-diags
-	!sys-infiniband/openib-files
-	!sys-infiniband/openib-osm
-	!sys-infiniband/openib-perf
-	!sys-infiniband/openib-srptools
-	!sys-infiniband/openib"
-
-S="${WORKDIR}/ofa_user-${PV}"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	rpm_unpack ${MY_P}/SRPMS/ofa_user-${PV}-0.src.rpm
-	tar xzf ofa_user-${PV}.tgz
-}
-
-src_compile() {
-	use ipath && myconf="$myconf --with-libipathverbs"
-	use ehca && myconf="$myconf --with-libehca"
-	use cxgb3 && myconf="$myconf --with-libcxgb3"
-	use opensm && myconf="$myconf --with-management-libs"
-	myconf="--with-libibverbs --with-libmthca"
-	myconf="$myconf --with-libibcm"
-	myconf="$myconf --with-libsdp"
-	myconf="$myconf --with-librdmacm"
-	myconf="$myconf $(use_with dapl)"
-	myconf="$myconf $(use_with opensm)"
-	myconf="$myconf --with-openib-diags"
-	myconf="$myconf --with-perftest"
-	myconf="$myconf $(use_with srptools)"
-	myconf="$myconf --with-ipoibtools"
-	myconf="$myconf $(use_with qlvnictools)"
-	myconf="$myconf $(use_with tvflash)"
-	myconf="$myconf $(use_with mstflint)"
-	myconf="$myconf --with-sdpnetstat"
-	#econf ${myconf} || die "configure failed"
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		${myconf} ${EXTRA_ECONF} || die "configure failed"
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc "${WORKDIR}/${MY_P}/README.txt"
-	dodoc "${WORKDIR}/${MY_P}/docs/*"
-	if use opensm ; then
-		newconfd "${OSM}/scripts/opensm.sysconfig" opensm
-		newinitd "${FILESDIR}/opensm.init.d" opensm
-		insinto /etc
-		doins "${S}/ofed_scripts/opensm.conf"
-		dobin "${S}/ofed_scripts/sldd.sh"
-	fi
-}
-
-pkg_postinst() {
-	einfo "To automatically configure the infiniband subnet manager on boot,"
-	einfo "edit /etc/opensm.conf and add opensm to your start-up scripts:"
-	einfo "\`rc-update add opensm default\`"
-}

diff --git a/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild b/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild
deleted file mode 100644
index c1088f1..0000000
--- a/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit rpm
-
-MY_P="OFED-${PV}"
-
-DESCRIPTION="OpenFabrics userspace libraries and utilities"
-HOMEPAGE="http://www.openfabrics.org/"
-SRC_URI="http://www.openfabrics.org/builds/ofed-${PV}/OFED-${PV}.tgz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~x86 ~amd64"
-IUSE="cxgb3 dapl ehca ipath mstflint opensm qlvnictools srptools tvflash"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-infiniband/openib-drivers-1.2
-	!sys-infiniband/libibverbs
-	!sys-infiniband/libmthca
-	!sys-infiniband/libipathverbs
-	!sys-infiniband/librdmacm
-	!sys-infiniband/libsdp
-	!sys-infiniband/dapl
-	!sys-infiniband/libehca
-	!sys-infiniband/libibcm
-	!sys-infiniband/libibcommon
-	!sys-infiniband/libibmad
-	!sys-infiniband/libibumad
-	!sys-infiniband/openib-diags
-	!sys-infiniband/openib-files
-	!sys-infiniband/openib-mvapich2
-	!sys-infiniband/openib-osm
-	!sys-infiniband/openib-perf
-	!sys-infiniband/openib-srptools
-	!sys-infiniband/openib"
-
-S="${WORKDIR}/ofa_user-${PV}"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	rpm_unpack ${MY_P}/SRPMS/ofa_user-${PV}-0.src.rpm
-	tar xzf ofa_user-${PV}.tgz
-}
-
-src_compile() {
-	use ipath && myconf="$myconf --with-libipathverbs"
-	use ehca && myconf="$myconf --with-libehca"
-	use cxgb3 && myconf="$myconf --with-libcxgb3"
-	use opensm && myconf="$myconf --with-management-libs"
-	myconf="--with-libibverbs --with-libmthca"
-	myconf="$myconf --with-libibcm"
-	myconf="$myconf --with-libsdp"
-	myconf="$myconf --with-librdmacm"
-	myconf="$myconf $(use_with dapl)"
-	myconf="$myconf $(use_with opensm)"
-	myconf="$myconf --with-openib-diags"
-	myconf="$myconf --with-perftest"
-	myconf="$myconf $(use_with srptools)"
-	myconf="$myconf --with-ipoibtools"
-	myconf="$myconf $(use_with qlvnictools)"
-	myconf="$myconf $(use_with tvflash)"
-	myconf="$myconf $(use_with mstflint)"
-	myconf="$myconf --with-sdpnetstat"
-	#econf ${myconf} || die "configure failed"
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		${myconf} ${EXTRA_ECONF} || die "configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc "${WORKDIR}/${MY_P}/README.txt"
-	dodoc "${WORKDIR}/${MY_P}/docs/*"
-	if use opensm ; then
-		newconfd "${FILESDIR}/opensm.conf.d" opensm
-		newinitd "${FILESDIR}/opensm.init.d" opensm
-	fi
-}

diff --git a/sys-infiniband/openib/openib-1.4.1.ebuild b/sys-infiniband/openib/openib-1.4.1.ebuild
deleted file mode 100644
index 5bce57c..0000000
--- a/sys-infiniband/openib/openib-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-HOMEPAGE="http://www.openfabrics.org/"
-DESCRIPTION="Meta package OFED"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dapl diags ehca ipath mlx4 mthca nes +opensm"
-
-DEPEND="
-	>=sys-infiniband/libibcm-1.0.4
-	>=sys-infiniband/libibcommon-1.1.2_p20081020
-	>=sys-infiniband/libibmad-1.2.3_p20081118
-	>=sys-infiniband/libibumad-1.2.3_p20081118
-	>=sys-infiniband/openib-files-${PV}
-	>=sys-infiniband/libsdp-1.1.99
-	>=sys-infiniband/openib-perf-1.2
-	dapl? ( >=sys-infiniband/dapl-2.0.15 )
-	diags? ( >=sys-infiniband/openib-diags-1.4.4_p20081207 )
-	ehca? ( >=sys-infiniband/libehca-1.2.1 )
-	ipath? ( >=sys-infiniband/libipathverbs-1.1 )
-	mlx4? ( >=sys-infiniband/libmlx4-1.0 )
-	mthca? ( >=sys-infiniband/libmthca-1.0.5 )
-	nes? ( >=sys-infiniband/libnes-0.5 )
-	opensm? ( >=sys-infiniband/openib-osm-3.2.5_p20081207 )"
-RDEPEND="${DEPEND}"

diff --git a/sys-infiniband/openib/openib-1.4.ebuild b/sys-infiniband/openib/openib-1.4.ebuild
deleted file mode 100644
index 5bce57c..0000000
--- a/sys-infiniband/openib/openib-1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-HOMEPAGE="http://www.openfabrics.org/"
-DESCRIPTION="Meta package OFED"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dapl diags ehca ipath mlx4 mthca nes +opensm"
-
-DEPEND="
-	>=sys-infiniband/libibcm-1.0.4
-	>=sys-infiniband/libibcommon-1.1.2_p20081020
-	>=sys-infiniband/libibmad-1.2.3_p20081118
-	>=sys-infiniband/libibumad-1.2.3_p20081118
-	>=sys-infiniband/openib-files-${PV}
-	>=sys-infiniband/libsdp-1.1.99
-	>=sys-infiniband/openib-perf-1.2
-	dapl? ( >=sys-infiniband/dapl-2.0.15 )
-	diags? ( >=sys-infiniband/openib-diags-1.4.4_p20081207 )
-	ehca? ( >=sys-infiniband/libehca-1.2.1 )
-	ipath? ( >=sys-infiniband/libipathverbs-1.1 )
-	mlx4? ( >=sys-infiniband/libmlx4-1.0 )
-	mthca? ( >=sys-infiniband/libmthca-1.0.5 )
-	nes? ( >=sys-infiniband/libnes-0.5 )
-	opensm? ( >=sys-infiniband/openib-osm-3.2.5_p20081207 )"
-RDEPEND="${DEPEND}"

diff --git a/sys-infiniband/openib/openib-1.5.3.1.ebuild b/sys-infiniband/openib/openib-1.5.3.1.ebuild
new file mode 100644
index 0000000..bc05121
--- /dev/null
+++ b/sys-infiniband/openib/openib-1.5.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+HOMEPAGE="http://www.openfabrics.org/"
+DESCRIPTION="Meta package OFED"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BSD-2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dapl diags ehca ipath mlx4 mthca nes +opensm"
+
+DEPEND="
+	>=sys-infiniband/libibcm-1.0.5
+	>=sys-infiniband/libibmad-1.3.7
+	>=sys-infiniband/libibumad-1.3.7
+	>=sys-infiniband/openib-files-${PV}
+	>=sys-infiniband/libsdp-1.1.108
+	>=sys-infiniband/perftest-1.3.0
+	dapl? ( >=sys-infiniband/dapl-2.0.32 )
+	diags? ( >=sys-infiniband/infiniband-diags-1.5.8 )
+	ehca? ( >=sys-infiniband/libehca-1.2.2 )
+	ipath? ( >=sys-infiniband/libipathverbs-1.1.4 )
+	mlx4? ( >=sys-infiniband/libmlx4-1.0.1 )
+	mthca? ( >=sys-infiniband/libmthca-1.0.5 )
+	nes? ( >=sys-infiniband/libnes-1.1.1 )
+	opensm? ( >=sys-infiniband/opensm-3.3.9 )"
+RDEPEND="${DEPEND}"

diff --git a/sys-infiniband/openib-osm/ChangeLog b/sys-infiniband/opensm/ChangeLog
similarity index 100%
rename from sys-infiniband/openib-osm/ChangeLog
rename to sys-infiniband/opensm/ChangeLog

diff --git a/sys-infiniband/openib-osm/files/opensm.init.d b/sys-infiniband/opensm/files/opensm.init.d
similarity index 100%
rename from sys-infiniband/openib-osm/files/opensm.init.d
rename to sys-infiniband/opensm/files/opensm.init.d

diff --git a/sys-infiniband/openib-osm/metadata.xml b/sys-infiniband/opensm/metadata.xml
similarity index 100%
rename from sys-infiniband/openib-osm/metadata.xml
rename to sys-infiniband/opensm/metadata.xml

diff --git a/sys-infiniband/openib-osm/openib-osm-3.2.5_p20081207.ebuild b/sys-infiniband/opensm/opensm-3.3.9.ebuild
similarity index 87%
rename from sys-infiniband/openib-osm/openib-osm-3.2.5_p20081207.ebuild
rename to sys-infiniband/opensm/opensm-3.3.9.ebuild
index 71ea151..f669590 100644
--- a/sys-infiniband/openib-osm/openib-osm-3.2.5_p20081207.ebuild
+++ b/sys-infiniband/opensm/opensm-3.3.9.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
 
 inherit openib
 
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	>=sys-infiniband/libibmad-1.2.3_p20081118
-	>=sys-infiniband/libibumad-1.2.3_p20081118"
+	>=sys-infiniband/libibmad-1.3.7
+	>=sys-infiniband/libibumad-1.3.7"
 RDEPEND="$DEPEND
 	 sys-infiniband/openib-files
 	 net-misc/iputils"

diff --git a/sys-infiniband/openib-perf/metadata.xml b/sys-infiniband/perftest/metadata.xml
similarity index 100%
rename from sys-infiniband/openib-perf/metadata.xml
rename to sys-infiniband/perftest/metadata.xml

diff --git a/sys-infiniband/openib-perf/openib-perf-1.2.ebuild b/sys-infiniband/perftest/perftest-1.3.0.ebuild
similarity index 70%
rename from sys-infiniband/openib-perf/openib-perf-1.2.ebuild
rename to sys-infiniband/perftest/perftest-1.3.0.ebuild
index d251c36..7e4a8e5 100644
--- a/sys-infiniband/openib-perf/openib-perf-1.2.ebuild
+++ b/sys-infiniband/perftest/perftest-1.3.0.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI="4"
 
-OFED_VER="1.4"
-OFED_SUFFIX="1.ofed1.4"
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="0.42.gf350d3d"
 
 inherit openib
 
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	>=sys-infiniband/libibverbs-1.1.2
-	>=sys-infiniband/librdmacm-1.0.8"
+	>=sys-infiniband/libibverbs-1.1.4
+	>=sys-infiniband/librdmacm-1.0.14"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sys-infiniband/rds-tools/rds-tools-1.4.ebuild b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
similarity index 70%
rename from sys-infiniband/rds-tools/rds-tools-1.4.ebuild
rename to sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
index 3387610..dff7bcc 100644
--- a/sys-infiniband/rds-tools/rds-tools-1.4.ebuild
+++ b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-OFED_VER="1.4.1"
+OFED_VER="1.5.3.1"
 OFED_SUFFIX="1"
 
 inherit openib
@@ -13,12 +13,10 @@ DESCRIPTION="OpenIB userspace rds-tools"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=sys-infiniband/libibverbs-1.1.2"
+DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
 		!sys-infiniband/openib-userspace"
 
-S="${WORKDIR}/${P}-${OFED_SUFFIX}"
-
 src_install() {
 	make DESTDIR="${D}" install || die "install failed"
 	dodoc README AUTHORS ChangeLog

diff --git a/sys-infiniband/openib-srptools/ChangeLog b/sys-infiniband/srptools/ChangeLog
similarity index 100%
rename from sys-infiniband/openib-srptools/ChangeLog
rename to sys-infiniband/srptools/ChangeLog

diff --git a/sys-infiniband/openib-srptools/metadata.xml b/sys-infiniband/srptools/metadata.xml
similarity index 100%
rename from sys-infiniband/openib-srptools/metadata.xml
rename to sys-infiniband/srptools/metadata.xml

diff --git a/sys-infiniband/srptools/srptools-0.0.4.ebuild b/sys-infiniband/srptools/srptools-0.0.4.ebuild
new file mode 100644
index 0000000..311dfad
--- /dev/null
+++ b/sys-infiniband/srptools/srptools-0.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+OFED_VER="1.5.3.1"
+OFED_SUFFIX="1"
+
+inherit openib
+
+DESCRIPTION="Tools for discovering and connecting to SRP CSI targets on InfiniBand fabrics"
+
+KEYWORDS="~amd64"
+IUSE=""