sci-physics/mpb: Respect CC, fix buildfailure due to remove configure.sub, #423123

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

4 files changed, 32 insertions, 16 deletions

diff --git a/sci-physics/mpb/ChangeLog b/sci-physics/mpb/ChangeLog
index 0cc8ca0c82f5..56f7d8dfb830 100644
--- a/sci-physics/mpb/ChangeLog
+++ b/sci-physics/mpb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/mpb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/ChangeLog,v 1.14 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/ChangeLog,v 1.15 2012/06/23 16:57:27 jlec Exp $
+
+  23 Jun 2012; Justin Lecher <jlec@gentoo.org> mpb-1.4.2-r2.ebuild,
+  metadata.xml:
+  Respect CC, fix buildfailure due to remove configure.sub, #423123
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> mpb-1.4.2-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-physics/mpb/Manifest b/sci-physics/mpb/Manifest
index 29639e915278..3c7522e6b4ce 100644
--- a/sci-physics/mpb/Manifest
+++ b/sci-physics/mpb/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mpb-1.4.2-autotools.patch 8563 RMD160 878928323396336911f6a317bbe9884c038c583b SHA1 76e25aa64a3f962f6c7e4b972e14585ee366cbe1 SHA256 112a37123c2d9151b120824111c9ce8a66c15e958fd51b64a45d6b3a6a98388f
 AUX mpb-1.4.2-gcc4.patch 1133 RMD160 f314858cd4154a12c2bdca5dc23ec4e3f7cefc91 SHA1 fde1483b2715aae12ba93d592011c540fa977b53 SHA256 5a58dd77d8b7d068f11496a61aa9001d657383b3f18274568de717e07d46ac3d
 AUX mpb-1.4.2-headers.patch 340 RMD160 b3c0f06657a9b67439d27a21ff1ed79ccb022aeb SHA1 8a647ae414dc51f7744a4bc5499c931d3a8e5377 SHA256 ffa8e166e8da83fd4b573d564de9c4f533b0b0903f7768547eeb7d662ea96416
 DIST mpb-1.4.2.tar.gz 686488 RMD160 6440f0e19d4b5b8354c135034429ea2031c4301d SHA1 2d4052566cff6c6befd31183253a908654b534f8 SHA256 e44c0720a5969a879fb93e48f6098d4d87e2f99d6ef49711d822f4c2249ccd61
-EBUILD mpb-1.4.2-r2.ebuild 2953 RMD160 334f0fde9e9e94d76128f553f066e54a9ce8af86 SHA1 d71ecfc54a3f4b72c78b2f78e73980a89be357d8 SHA256 37bd0304ce8b8c5b8dae63f3cae887a5a51cd5fc2f6654e606e178cce5ce7045
-MISC ChangeLog 1929 RMD160 0d37ba5f7f0722e4f6b1b762bf8fa30ffe7a4a25 SHA1 1a068d2141ec7214eaf7204baa1612cf948c0b8b SHA256 e390bef9f85b910e0096bd843b57a7d6752824d1dcb48d164b4958b04b4611d8
-MISC metadata.xml 1010 RMD160 28b3ab1d9a4b0b36801c7d6adccd90a6bdfcddcc SHA1 638d1564111f138b6c7609fb31fbb57349e092f0 SHA256 56808d2ceabecc68e966a1e82a2c2480c05e3c353db67753bd8382c0279c5ae8
+EBUILD mpb-1.4.2-r2.ebuild 2908 RMD160 c23462e411c1f7f756532698108d882925f6f8e9 SHA1 8cc2339fc9ee8b764d5a93de1d94c0765c4df56f SHA256 448eb3cd24d5cb0b0fe32fafc174865852690becb9020cb0970492c6e0124049
+MISC ChangeLog 2080 RMD160 1b8159af4ea4c67fe1830a6c49dca9c1af72724c SHA1 e9dba2b8b6afcfbe824a3376650255c51b66cfc4 SHA256 2c7da4b2998c7ac9420dc69b9ecd92349572c99e2bdf55769b04fab9ef13d648
+MISC metadata.xml 1011 RMD160 3db16c42d9405c70c596f9ecc052ddd0054af9a3 SHA1 d544a2bd167061cda34c29a31aae53356a4702b2 SHA256 3135f494ad7d9c967ca6cfb233ecc803a868ff4e36343a8809c5ef36ed10ec8f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/l9XwACgkQgAnW8HDreRZvZwCfTOxFvuWOa23ub6NN5HTeko0e
+jKoAn2LxOoib6uodhsh2sEWIvH197SUh
+=J1R2
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/mpb/metadata.xml b/sci-physics/mpb/metadata.xml
index a7870e267ce6..36994b3229fd 100644
--- a/sci-physics/mpb/metadata.xml
+++ b/sci-physics/mpb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   The MIT Photonic-Bands (MPB) package is a program for computing
   the band structures (dispersion relations) and electromagnetic modes of
   periodic dielectric structures, on both serial and parallel computers. It was
@@ -18,4 +18,3 @@
   cross-sections.)
 </longdescription>
 </pkgmetadata>
-
diff --git a/sci-physics/mpb/mpb-1.4.2-r2.ebuild b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
index 06a38861e0d2..419310e881f8 100644
--- a/sci-physics/mpb/mpb-1.4.2-r2.ebuild
+++ b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.4 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.5 2012/06/23 16:57:27 jlec Exp $
 
-EAPI=2
-inherit eutils autotools flag-o-matic
+EAPI=4
+
+inherit eutils autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Photonic band structure program"
 SRC_URI="http://ab-initio.mit.edu/mpb/${P}.tar.gz"
@@ -27,11 +28,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-headers.patch
 	cd "${S}"
-	rm -f config.*
-	AT_NOELIBTOOLIZE=yes eautoreconf
+	eautoreconf
 	# version with inversion symmetry (mpbi).
 	cp -r "${S}" "${S}_inv"
 	# version with hermitian eps (mpbh).
@@ -42,6 +43,7 @@ src_prepare() {
 		cp -r "${S}" "${S}_inv_mpi"
 		cp -r "${S}" "${S}_herm_mpi"
 	fi
+	tc-export CC
 }
 
 src_configure() {
@@ -82,8 +84,8 @@ src_compile() {
 	local dirs="${S} ${S}_inv ${S}_herm"
 	for d in ${dirs}; do
 		cd "${d}"
-		emake -C mpb-ctl ctl-io.c || die
-		emake || die "emake in ${d} failed"
+		emake -C mpb-ctl ctl-io.c
+		emake
 	done
 	local dirs="${S} ${S}_inv ${S}_herm"
 	if use mpi; then