public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sys-infiniband/openib-userspace/
Date: Fri, 24 Jun 2011 17:09:29 +0000 (UTC)	[thread overview]
Message-ID: <8ee9877f30ca4aa19e21215d4619b3d1ed801b46.jlec@gentoo> (raw)

commit:     8ee9877f30ca4aa19e21215d4619b3d1ed801b46
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:40:32 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 16:40:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8ee9877f

Sort inherit and/or USE

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

---
 sys-infiniband/openib-userspace/metadata.xml       |   15 ++++-
 .../openib-userspace-1.2.5.1-r1.ebuild             |   71 +++++++++----------
 .../openib-userspace-1.2.5.5.ebuild                |   67 +++++++++----------
 .../openib-userspace/openib-userspace-1.2.ebuild   |   69 +++++++++----------
 4 files changed, 112 insertions(+), 110 deletions(-)

diff --git a/sys-infiniband/openib-userspace/metadata.xml b/sys-infiniband/openib-userspace/metadata.xml
index d79dcfd..d6772da 100644
--- a/sys-infiniband/openib-userspace/metadata.xml
+++ b/sys-infiniband/openib-userspace/metadata.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-<longdescription>
+  <herd>cluster</herd>
+  <longdescription>
 OpenFabrics Userspace libraries and tools.  Infiniband for Linux.
 See 'www.openfabrics.org'.
 </longdescription>
+  <use>
+    <flag name="cxgb3">Automatically generated description for cxgb3</flag>
+    <flag name="dapl">Automatically generated description for dapl</flag>
+    <flag name="ehca">Automatically generated description for ehca</flag>
+    <flag name="ipath">Automatically generated description for ipath</flag>
+    <flag name="mstflint">Automatically generated description for mstflint</flag>
+    <flag name="opensm">Automatically generated description for opensm</flag>
+    <flag name="qlvnictools">Automatically generated description for qlvnictools</flag>
+    <flag name="srptools">Automatically generated description for srptools</flag>
+    <flag name="tvflash">Automatically generated description for tvflash</flag>
+  </use>
 </pkgmetadata>

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
index 31221cd..0c98438 100644
--- 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
@@ -1,46 +1,44 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /CVS/groups/vistech/bgreen-overlay/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild,v 1.1.1.1 2007/10/12 20:18:26 bgreen Exp $
+# $Header: $
 
 inherit rpm
 
-LICENSE="|| ( GPL-2 BSD-2 )"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-DESCRIPTION="OpenFabrics userspace libraries and utilities.  This ebuild is an
-all-inclusive alternative to the openib metapackage and dependencies"
-
-HOMEPAGE="http://www.openfabrics.org/"
 SHORT_PV=${PV%\.[^.]}
-SRC_URI="http://www.openfabrics.org/builds/ofed-${SHORT_PV}/release/OFED-${PV}.tgz"
 MY_P="OFED-${PV}"
-S="${WORKDIR}/ofa_user-${PV}"
 OSM="${S}/src/userspace/management/osm"
 
-IUSE="ehca ipath cxgb3 opensm dapl srptools qlvnictools tvflash mstflint"
+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"
+	!<=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"
@@ -49,15 +47,15 @@ src_unpack() {
 }
 
 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"
-	if use ipath ; then myconf="$myconf --with-libipathverbs"; fi
-	if use ehca ; then myconf="$myconf --with-libehca"; fi
-	if use cxgb3 ; then myconf="$myconf --with-libcxgb3"; fi
 	myconf="$myconf --with-libibcm"
 	myconf="$myconf --with-libsdp"
 	myconf="$myconf --with-librdmacm"
 	myconf="$myconf $(use_with dapl)"
-	if use opensm ; then myconf="$myconf --with-management-libs"; fi
 	myconf="$myconf $(use_with opensm)"
 	myconf="$myconf --with-openib-diags"
 	myconf="$myconf --with-perftest"
@@ -71,7 +69,7 @@ src_compile() {
 	./configure --prefix=/usr --mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		${myconf} ${EXTRA_ECONF} || die "configure failed"
-	emake -j1
+	emake -j1 || die
 }
 
 src_install() {
@@ -92,4 +90,3 @@ pkg_postinst() {
 	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.5.5.ebuild b/sys-infiniband/openib-userspace/openib-userspace-1.2.5.5.ebuild
index d8bbe3b..95faf61 100644
--- a/sys-infiniband/openib-userspace/openib-userspace-1.2.5.5.ebuild
+++ b/sys-infiniband/openib-userspace/openib-userspace-1.2.5.5.ebuild
@@ -1,45 +1,43 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
+# $Header: $
 
 inherit rpm
 
-LICENSE="|| ( GPL-2 BSD-2 )"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-DESCRIPTION="OpenFabrics userspace distribution.  An all-inclusive ebuild
-alternative to the openib meta-ebuild"
-
-HOMEPAGE="http://www.openfabrics.org/"
 SHORT_PV=${PV%\.[^.]}
-SRC_URI="http://www.openfabrics.org/builds/ofed-${SHORT_PV}/release/OFED-${PV}.tgz"
 MY_P="OFED-${PV}"
-S="${WORKDIR}/ofa_user-${PV}"
 OSM="${S}/src/userspace/management/osm"
 
-IUSE="ehca ipath cxgb3 opensm dapl srptools qlvnictools tvflash mstflint"
+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=""
 PDEPEND="=sys-infiniband/openib-files-${PV}"
 RDEPEND="${DEPEND}
-		 !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-osm
-		 !sys-infiniband/openib-perf
-		 !sys-infiniband/openib-srptools
-		 !sys-infiniband/openib"
+	!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-osm
+	!sys-infiniband/openib-perf
+	!sys-infiniband/openib-srptools
+	!sys-infiniband/openib"
+
+S="${WORKDIR}/ofa_user-${PV}"
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
@@ -48,15 +46,15 @@ src_unpack() {
 }
 
 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"
-	if use ipath ; then myconf="$myconf --with-libipathverbs"; fi
-	if use ehca ; then myconf="$myconf --with-libehca"; fi
-	if use cxgb3 ; then myconf="$myconf --with-libcxgb3"; fi
 	myconf="$myconf --with-libibcm"
 	myconf="$myconf --with-libsdp"
 	myconf="$myconf --with-librdmacm"
 	myconf="$myconf $(use_with dapl)"
-	if use opensm ; then myconf="$myconf --with-management-libs"; fi
 	myconf="$myconf $(use_with opensm)"
 	myconf="$myconf --with-openib-diags"
 	myconf="$myconf --with-perftest"
@@ -70,7 +68,7 @@ src_compile() {
 	./configure --prefix=/usr --mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		${myconf} ${EXTRA_ECONF} || die "configure failed"
-	emake -j1
+	emake -j1 || die
 }
 
 src_install() {
@@ -91,4 +89,3 @@ pkg_postinst() {
 	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
index 02d1ee4..c1088f1 100644
--- a/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild
+++ b/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild
@@ -1,45 +1,43 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /CVS/groups/vistech/bgreen-overlay/sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild,v 1.1.1.1 2007/10/12 20:18:26 bgreen Exp $
+# $Header: $
 
 inherit rpm
 
-LICENSE="|| ( GPL-2 BSD-2 )"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-DESCRIPTION="OpenFabrics userspace libraries and utilities.  This ebuild is an
-all-inclusive alternative to the openib metapackage and dependencies"
+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"
-MY_P="OFED-${PV}"
-S="${WORKDIR}/ofa_user-${PV}"
 
-IUSE="ehca ipath cxgb3 opensm dapl srptools qlvnictools tvflash mstflint"
+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"
+	>=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"
@@ -48,15 +46,15 @@ src_unpack() {
 }
 
 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"
-	if use ipath ; then myconf="$myconf --with-libipathverbs"; fi
-	if use ehca ; then myconf="$myconf --with-libehca"; fi
-	if use cxgb3 ; then myconf="$myconf --with-libcxgb3"; fi
 	myconf="$myconf --with-libibcm"
 	myconf="$myconf --with-libsdp"
 	myconf="$myconf --with-librdmacm"
 	myconf="$myconf $(use_with dapl)"
-	if use opensm ; then myconf="$myconf --with-management-libs"; fi
 	myconf="$myconf $(use_with opensm)"
 	myconf="$myconf --with-openib-diags"
 	myconf="$myconf --with-perftest"
@@ -70,7 +68,7 @@ src_compile() {
 	./configure --prefix=/usr --mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		${myconf} ${EXTRA_ECONF} || die "configure failed"
-	emake
+	emake || die
 }
 
 src_install() {
@@ -82,4 +80,3 @@ src_install() {
 		newinitd "${FILESDIR}/opensm.init.d" opensm
 	fi
 }
-



                 reply	other threads:[~2011-06-24 17:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8ee9877f30ca4aa19e21215d4619b3d1ed801b46.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox