USE=-mpi should not include mpi-code

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 90 insertions, 2 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/Manifest b/dev-libs/maloc/Manifest
index 357f9d06e385..3f8a3d042bb1 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.2.1-mpi.patch 653 RMD160 da9fa5ea837b68538c8c43930d30e9cdeabf1ccf SHA1 eaaf73f2cd210c63bb8ed841481744e587869884 SHA256 9d76868accbd89a8960bd61a35d20da359d4f04744761e0b12fb05440a106800
 DIST maloc-0.1-2.tar.gz 897057 RMD160 ce6e9e4bb9a40b2354198dea116c8b2ed2f40f9e SHA1 5375b36971276f3beb99f6ef13b18667b6126e10 SHA256 4b49cff818e6cabbbe9c43408b69a70318c7d9d912a8c8a084aaf58c15693471
 DIST maloc-0.1-3.tar.gz 941856 RMD160 2a7195f27411a9716f5f0dc3079ad48053e3c044 SHA1 ef915eece3f907fcbd26327d51e58ead3d4b669a SHA256 6b3ab862bef857b9ab3359fadc62f8cd6a0f24004510e4e9c1eac1bbb1eddd5d
 DIST maloc-0.2-1.tar.gz 739622 RMD160 503cccc43a6e7de76e1ec33c11b45a9f764f9e6b SHA1 2f1b0a0cbc38eda5324228deabc1ea59e4e2253c SHA256 9b29c4b6401adf20ce1ab3c47fe71066ca7952eb10db4b1e6b1440973f616cda
 EBUILD maloc-0.1.2.ebuild 1151 RMD160 ddd48d21b8216f3224359c0a4298f3810181f473 SHA1 53c76ef662bcbf794f1a152822de3abfc5dd44ed SHA256 4658c9d457cb4c4d56898e06afb9934fd61fc7a75c90ae9f7cf0f6edd8df4944
 EBUILD maloc-0.1.3.ebuild 1268 RMD160 00d770824bb9bdbcaf8afe8f071be5ac72393a70 SHA1 04f6d1c1b13fe293c1c4e5ebc0985484803ca1b3 SHA256 844bc6a49fc250e33c105ae30f08656d9e072386ebe96a707fc91a74696497db
+EBUILD maloc-0.2.1-r1.ebuild 1186 RMD160 e5660e8283a1aec038c02449ecb236383be0b54d SHA1 a4ac54bf836f953988dffc517763743ac30743b5 SHA256 12b96120245f11d843bf7f3efe0fddaa04729eb68d77cfc2f30d134fe7279127
 EBUILD maloc-0.2.1.ebuild 1187 RMD160 d38d9f4de4b87889ac2e31003bf3f0427864963e SHA1 f74e469808a00c4fb8a1185515cad52a9a907652 SHA256 5bbc7226016ead0a2b5a4e0900146f56121eb7e3e42e38df628744194a9fd9a1
-MISC ChangeLog 1341 RMD160 2f1664e7845e24e6a8331de05bd7be9b61de638c SHA1 925bcce690adaa1b5c8138d2a06e61e56901945a SHA256 802bcbd653935cbb31a9da29f644404c0cd772c6cf315aad02482c20581f7136
+MISC ChangeLog 1506 RMD160 136ea37a7bb50c97ccc03cf2de4c9789782dfca5 SHA1 0f2114dd2e675f34d4700d176bffeaefe7b66e4c SHA256 bd69ae9b0744c6e25d18122cb13b1160ac459413234079d9f9487f2743c71820
 MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuvguAACgkQgAnW8HDreRYVgACdGh9sxcE/4+y+j8gK7wL4sNtk
+ASoAoM5PaAQWMB15LqsyA3N+Di+Qw6kX
+=D6bF
+-----END PGP SIGNATURE-----
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"
+}