USE=-mpi should not include mpi-code

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 77 insertions, 1 deletions

diff --git a/dev-libs/maloc/ChangeLog b/dev-libs/maloc/ChangeLog
index d1cd331f4c42..323f68b96d09 100644
--- a/dev-libs/maloc/ChangeLog
+++ b/dev-libs/maloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/maloc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.9 2010/01/12 04:24:06 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.10 2010/03/28 16:24:59 jlec Exp $
+
+*maloc-0.2.1-r1 (28 Mar 2010)
+
+  28 Mar 2010; Justin Lecher <jlec@gentoo.org> +files/0.2.1-mpi.patch,
+  +maloc-0.2.1-r1.ebuild:
+  USE=-mpi should not include mpi-code
 
 *maloc-0.2.1 (12 Jan 2010)
 
diff --git a/dev-libs/maloc/files/0.2.1-mpi.patch b/dev-libs/maloc/files/0.2.1-mpi.patch
new file mode 100644
index 000000000000..824752bdbeb8
--- /dev/null
+++ b/dev-libs/maloc/files/0.2.1-mpi.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index ab7726e..0208780 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -381,12 +381,14 @@ AC_SUBST(rl_inc)
+ dnl # ----------------------
+ dnl # HANDLE THE MPI LIBRARY
+ dnl # ----------------------
++mpi_use="";
+ AC_MSG_CHECKING([whether you want MPI])
+-AC_ARG_ENABLE(mpi,
+-    [  --enable-mpi            enable MPI layer [[default=no]]],
+-    [ mpi_use="yes" ],
+-    [ mpi_use=""    ]
+-)
++AC_ARG_ENABLE([mpi],
++    AS_HELP_STRING([--enable-mpi            enable MPI layer [[default=no]]]))
++
++AS_IF([test "x$enable_mpi" = "xyes"], [
++    mpi_use="yes"
++])
+ mpi_lib="";
+ mpi_inc="";
+ if test -z "${mpi_use}"; then
diff --git a/dev-libs/maloc/maloc-0.2.1-r1.ebuild b/dev-libs/maloc/maloc-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..17570c3a9bb9
--- /dev/null
+++ b/dev-libs/maloc/maloc-0.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-0.2.1-r1.ebuild,v 1.1 2010/03/28 16:24:59 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+MY_PV="0.2-1"
+
+DESCRIPTION="Small, portable, abstract C environment library for object-oriented C programming"
+HOMEPAGE="http://scicomp.ucsd.edu/~mholst/codes/maloc/index.html#overview"
+SRC_URI=" http://cam.ucsd.edu/~mholst/codes/${PN}/${PN}-${MY_PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="mpi"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	sys-libs/readline
+	mpi? ( virtual/mpi )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-mpi.patch
+	eautoreconf
+}
+
+src_configure() {
+	# fix install location of libs in Makefile
+	sed -e "s|libdir = \${prefix}/lib/\${fetk_cpu_vendor_os}|libdir = \${prefix}/$(get_libdir)/|" \
+		-i src/aaa_lib/Makefile.in || \
+		die "failed to patch lib Makefile"
+
+	econf $(use_enable mpi)
+}
+
+src_install() {
+	# install libs and headers
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install doc
+	dohtml doc/index.html || die "failed to install html docs"
+}