Version bump, removed LDFLAGS from the pkg-config flag, added a mpb flag to compile against sci-physics/mpb, avoiding automagic

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 114 insertions, 12 deletions

diff --git a/sci-physics/meep/ChangeLog b/sci-physics/meep/ChangeLog
index bec86fd608af..3f8da1741d6d 100644
--- a/sci-physics/meep/ChangeLog
+++ b/sci-physics/meep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-physics/meep
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/meep/ChangeLog,v 1.16 2010/06/23 20:18:30 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/meep/ChangeLog,v 1.17 2012/08/14 22:50:51 bicatali Exp $
+
+*meep-1.2 (14 Aug 2012)
+
+  14 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/meep-1.2-no-auto-mpb.patch, +files/meep-1.2-pc-no-ldflags.patch,
+  +meep-1.2.ebuild, metadata.xml:
+  Version bump, removed LDFLAGS from the pkg-config flag, added a mpb flag to
+  compile against sci-physics/mpb, avoiding automagic
 
   23 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> meep-1.1.1.ebuild:
   Removed bindist flag, should be compatible GPL-3 anyway
@@ -69,4 +77,3 @@
   06 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/meep-0.10.1-configure.ac.patch, +metadata.xml, +meep-0.10.1.ebuild:
   Initial import. Ebuild first submitted by Ben Schwartz, see bug #170989
-
diff --git a/sci-physics/meep/Manifest b/sci-physics/meep/Manifest
index 1bfb03fc8eec..c9971d580608 100644
--- a/sci-physics/meep/Manifest
+++ b/sci-physics/meep/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST meep-1.1.1.tar.gz 751244 RMD160 5b74b172678d5ce7e8d7ac2d7b78649aafdb11cb SHA1 df1910906ebc996ae154b6de78bb67ceadbb2813 SHA256 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2
-EBUILD meep-1.1.1.ebuild 982 RMD160 79ec71172e2cffc06d83a9a8231d503abd3a710f SHA1 af6ff718c04c39001d587aba2e9e3f8df0bc112f SHA256 97cf2ab9c3da0431999a8000f909ab7ba6179c0b5e4d356a34496242bd5247a2
-MISC ChangeLog 2661 RMD160 3b1219720568e5ac347b3f4dad81d5e7ef950061 SHA1 cc3762e9d2db95786499e1e4585583c29502cffc SHA256 f93d34bc7e37dec12168316713fd4b2cbe1b10a8de8e27c831f21c7fd87e72da
-MISC metadata.xml 430 RMD160 5de538a1e8b2d45195c08c18dfa649b18c2027bf SHA1 fa5340a8b76390854364680339dbd8b0672d32a1 SHA256 4cbf4812adbd8f9586e1876415c97b69b3ce860290763b8b98e758d64d454bc9
+AUX meep-1.2-no-auto-mpb.patch 652 SHA256 b898487ea962ed071db15d8212ce550e995603992b94a124694a83403fa24e59 SHA512 4a25e919ac828920fb1ad2395acb897e0b9d9123fa55ee3ed33a4c07e79d250602cb496435482710315c077d3d5408d0192d629afd70dca64aedc7a649c7091f WHIRLPOOL c3f87de28b30ce3491c17db9297e1776215caf5ee9c017b2b8fbe476fa27d2cf886691fe41cab13ab321bd3ebafce4345bdf45dfc4aea91e2e03366ceecd9d65
+AUX meep-1.2-pc-no-ldflags.patch 503 SHA256 04c8cc58833a3b0abdf4014cc561d4e6dd1099c9662ac786966b3f363b605c17 SHA512 2e8602f21814f4edef4b0572180b0b4f41f91a23d7e2576da6a2c62d602e55e9a70b5c7124cb60b7ea4d2f6debd10db3a30aa451d4b6d82eed7a7d9655a26a82 WHIRLPOOL 90140a3646ee9958b3fe076d858cafae8b946fcb1c625ff97640ebc0d8795e917164f30d1140901d0a0ec2ad4c9de8ba1b27decb1ad21a06b09c0c1d1f1e246e
+DIST meep-1.1.1.tar.gz 751244 SHA256 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2
+DIST meep-1.2.tar.gz 807522 SHA256 2734737b8053a45942bc1a50933d63b6fd18c7dc3cf33e92e0815ece93138942 SHA512 f7b25183491881d59653ba5bc727a2b4f5deb126d515ff7ed5df7a1f9d31a5161b720348e65f45b9c76004be44714c606c4b8063f855b5cc97ff7757bd5a5656 WHIRLPOOL 54940326d8f304a57c2dd69c411ef394f44cd2c57367f16a4a0dd6d3fa6df0ee01e0b0081048b4ec3fd8eff404e76507d6dea5db1b9b975096a40d34d1595080
+EBUILD meep-1.1.1.ebuild 982 SHA256 97cf2ab9c3da0431999a8000f909ab7ba6179c0b5e4d356a34496242bd5247a2 SHA512 96361668fdca841c008b6574d485afb9ed3743da6304877b40817a8b75b4cee517f8ad4ec6707d3087770f993cdcba5cfb118a6ee2d2f25f1f239055b2cd9986 WHIRLPOOL dd2a830caecbc05b8fc377cc6415c1722fb3f573f7444863603610bef4e73da326c701ab6b0e2232c38ba0fde1f86fd1dce42710253fb6eb217081812560d34b
+EBUILD meep-1.2.ebuild 1384 SHA256 fd2b299fae443b7219f49127490c30c2f3f1f699a0313515152d929203f6e0e7 SHA512 1059466fe4932298e8e4d6a9f008ee3281a7a510521bcc797526f83a596bf6cf226c394967eee10fcf3793ccbd9fec8b4fa992e1e261752769ec2264ece89ef0 WHIRLPOOL cdd8369dcc12e8d7f3b4c368c48d00d1497bfc41ed7d77bed78de9bedd799044b30b65d6b88ffaf02ef04da3a54970d8b454bd38edaabebbf0985ce237c6ee40
+MISC ChangeLog 2981 SHA256 fb35be803e1381390e267c1e234703caf9fdc4da1411f376adebc3b637c30c2e SHA512 799fdf836007b239e83c66f6f98d5a1fe1faeacc0d60a8508605d059a1cbc7328e6d2181aed41ea333a586054070737926b6f59cca6249adc4707761201abf4c WHIRLPOOL 73533fd935f599b81f660f834644b85d173bcdede5597d9fbc7d2fe685ac74c5c54fe42f2110f2ec2b2a0ff32c2f9cc3e1f888417193cd8bacb29cd5e6d0894f
+MISC metadata.xml 517 SHA256 7179b73a9d03d61713f076ee4402f8d919dcd368d5cd4291256ea18f127eac84 SHA512 efd96376ff0fc5b90051f74460b9824fe1ce6ada7f45a06104ec4f67d5c73ed57f73fbb83ef71452a842ca54db79e893df91deb9467f528bda1d8e1aa33dcc49 WHIRLPOOL d71804c27d356df71010ccd55df6d1bbf786429951aa2dc9fbda02827d4267b3d2b644aac14294f9e0fac773d14e6aa309924fa955d8e958e0bae0f82b5e5477
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkwibB4ACgkQ1ycZbhPLE2CozwCfTe7S8qejQ49OAHDRkhRZTcGH
-BGQAni+B8cPndHcacJTi9MxgClD6ucUQ
-=YFOo
+iEYEAREIAAYFAlAq1lQACgkQ1ycZbhPLE2AhuwCeK4DUDWn/14uBmjOmVJK+afLZ
+J6YAn0hu3RgJq4/Z1RPgeKOKlzBGq7QQ
+=D4Ku
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch b/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch
new file mode 100644
index 000000000000..8c287f208d65
--- /dev/null
+++ b/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch
@@ -0,0 +1,16 @@
+diff -Nur meep-1.2.orig/configure.ac meep-1.2/configure.ac
+--- meep-1.2.orig/configure.ac	2012-08-14 21:52:13.000000000 +0100
++++ meep-1.2/configure.ac	2012-08-14 22:00:55.000000000 +0100
+@@ -161,8 +161,10 @@
+ 
+ ###########################################################################
+ # MPB library
+-
+-AC_CHECK_HEADER(mpb.h, [have_mpb=maybe], [have_mpb=no])
++AC_ARG_WITH(mpb, [AC_HELP_STRING([--without-mpb],[do not build with mpb])], ok=$withval, ok=yes)
++if test "$ok" = "yes"; then
++   AC_CHECK_HEADER(mpb.h, [have_mpb=maybe], [have_mpb=no])
++fi
+ 
+ if test $have_mpb = maybe; then
+   if test "x$acx_lapack_ok" = x -a "$have_harminv" = xno; then
diff --git a/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch b/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch
new file mode 100644
index 000000000000..d7b2f72eaffc
--- /dev/null
+++ b/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nur meep-1.2.orig/configure.ac meep-1.2/configure.ac
+--- meep-1.2.orig/configure.ac	2012-08-14 21:52:13.000000000 +0100
++++ meep-1.2/configure.ac	2012-08-14 21:54:49.000000000 +0100
+@@ -224,7 +224,7 @@
+ ##############################################################################
+ # Libraries and flags (other than -lmeep) required to link Meep:
+ 
+-MEEPLIBS="$LDFLAGS $LIBS"
++MEEPLIBS="$LIBS"
+ AC_SUBST(MEEPLIBS)
+ 
+ ##############################################################################
diff --git a/sci-physics/meep/meep-1.2.ebuild b/sci-physics/meep/meep-1.2.ebuild
new file mode 100644
index 000000000000..8055f56bf2c1
--- /dev/null
+++ b/sci-physics/meep/meep-1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/meep/meep-1.2.ebuild,v 1.1 2012/08/14 22:50:50 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Simulation software to model electromagnetic systems"
+HOMEPAGE="http://ab-initio.mit.edu/meep/"
+SRC_URI="http://ab-initio.mit.edu/meep/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples hdf5 guile mpb mpi"
+
+RDEPEND="
+	sci-libs/fftw
+	sci-libs/gsl
+	sci-physics/harminv
+	guile? ( >=sci-libs/libctl-3.2 )
+	hdf5? ( sci-libs/hdf5 )
+	mpb? ( sci-physics/mpb )
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pc-no-ldflags.patch
+	"${FILESDIR}"/${P}-no-auto-mpb.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with mpb)
+		$(use_with mpi)
+		$(use_with hdf5)
+		$(use_with guile libctl)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	# pml test buggy with optimization on
+	# http://thread.gmane.org/gmane.comp.science.electromagnetism.meep.general/4579
+	pushd ${AUTOTOOLS_BUILD_DIR} > /dev/null
+	emake -C tests pml CXXFLAGS="-O0"
+	emake check
+	popd > /dev/null
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*.ctl
+	fi
+}
diff --git a/sci-physics/meep/metadata.xml b/sci-physics/meep/metadata.xml
index b1867dddf8f3..17865fb063ef 100644
--- a/sci-physics/meep/metadata.xml
+++ b/sci-physics/meep/metadata.xml
@@ -8,4 +8,7 @@
   developed at MIT to model electromagnetic systems, along with the MPB
   eigenmode package.
 </longdescription>
+<use>
+  <flag name='mpb'>Enable build against <pkg>sci-physics/mpb</pkg></flag>
+</use>
 </pkgmetadata>