Fixed for guile-1.8. Switched to EAPI4. Cleanup ebuild. Install properly mpbi. Keyword amd64-linux, x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

6 files changed, 69 insertions, 73 deletions

diff --git a/sci-physics/mpb/ChangeLog b/sci-physics/mpb/ChangeLog
index 56f7d8dfb830..d7253da30ee9 100644
--- a/sci-physics/mpb/ChangeLog
+++ b/sci-physics/mpb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2012/06/23 16:57:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/ChangeLog,v 1.16 2012/08/08 04:08:59 bicatali Exp $
+
+  08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/mpb-1.4.2-guile18.patch, -files/mpb-1.4.2-gcc4.patch, metadata.xml,
+  mpb-1.4.2-r2.ebuild:
+  Fixed for guile-1.8. Switched to EAPI4. Cleanup ebuild. Install properly mpbi.
+  Keyword amd64-linux, x86-linux
 
   23 Jun 2012; Justin Lecher <jlec@gentoo.org> mpb-1.4.2-r2.ebuild,
   metadata.xml:
@@ -57,4 +63,3 @@
 
   04 Jan 2006; Peter Bienstman <pbienst@gentoo.org> +mpb-1.4.2.ebuild:
   New ebuild (closes #36581).
-
diff --git a/sci-physics/mpb/Manifest b/sci-physics/mpb/Manifest
index 3c7522e6b4ce..ccac08c30349 100644
--- a/sci-physics/mpb/Manifest
+++ b/sci-physics/mpb/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-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 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
+AUX mpb-1.4.2-autotools.patch 8563 SHA256 112a37123c2d9151b120824111c9ce8a66c15e958fd51b64a45d6b3a6a98388f SHA512 e5e2212a42eca5f10502a2f55bb8e294353dfae2fa82383e110a6edc40d794a6d5af02c74347d952ae40c60d5cc7254d4d43d66618a490675412b3d767e0307d WHIRLPOOL 169bf5c733a5c3e70d5f413f5664b1d5761346f5276ea3405cc4b70892d63fb553226eaae3012c149876545fdbfe9cee2ccbc3e341ec6a677c936ba2553fe304
+AUX mpb-1.4.2-guile18.patch 471 SHA256 279274c5caa90c3fe362b4e35b707d4b1900e0acddb2534df599952a6c26b944 SHA512 0092bc0a8dc98c479e1ca7cf4370ed7147c0bc1079ff4b5569ba82eba00ec43af7a3ccfc751a5d6f3d91b39ec125fc85c039e6e249d00e4043c08c7b3f4de2fe WHIRLPOOL d2b2a3226d923426bc0d871bd91aa09d92fe259c32d53e197af90dd04a6acf5520528fdb3afedc86b3692cdf3824892134d120fad1906eb6ba969e4bc6af978e
+AUX mpb-1.4.2-headers.patch 340 SHA256 ffa8e166e8da83fd4b573d564de9c4f533b0b0903f7768547eeb7d662ea96416 SHA512 56ed131b1e1ce67c2e1258b80b16772b9860438a7366aa286c67292424a427db32bca531bc6fdfe9c2fab0a2514d4d67bf71c70e55faaa99d842081225812b78 WHIRLPOOL 2507bc2a01fd47be3a9066c87ecaafc5c72a719eb6e191a56550f21e135b14b17188b46d6a253ac1a3fcbd43e8289fcd75f5f4643ee488f115a0fc7439b28927
+DIST mpb-1.4.2.tar.gz 686488 SHA256 e44c0720a5969a879fb93e48f6098d4d87e2f99d6ef49711d822f4c2249ccd61 SHA512 4151612b8868b324353556f46aeccdce2726d8938ab8cf7404c36da68e90ec0de1799d4e23b2d5bbe5853d0c0329ba0ee1a2fdb2745aed43c34759084b62fbac WHIRLPOOL e0b256c06bdd2c7479723c0db6c434e645b6fbf1a052ebc2971203902f9bf09336b4bf69ec8c8f1cd9b4952672a28290b4ff66c44f56feae135d9cbf07284473
+EBUILD mpb-1.4.2-r2.ebuild 2913 SHA256 fca908f1d59eadb52b6485df34b558809f43fa7007c6d531c14269a4d1242b3a SHA512 72edd574af6bc2b8409e5417544303055f7e78c917260160e2b274c07902f876e2cb8a3c86102e0965c44e7910640f73544dbabf9481406fc9a9038fbd4db731 WHIRLPOOL b12fed724eb23528441743e3ba8d148cbc816c48a82450ae218ee385df84283535c106e7c83793a29cf792b61dcad9615f1262f890b470e8b876c04a0df86766
+MISC ChangeLog 2353 SHA256 dd17d2cce2332262a68cd0a4ec79c91c71f091658369211c1e3680edc51326a9 SHA512 83841811767082511418ff60815cd0c9f7cb85c319eae874b5514b534def996a1f33020b03f70e6d7a30c81eead22fdd12698f0689ee02eac4db5fb38e294fd2 WHIRLPOOL d1c03e224ee7b8a086e8aa03c31ee60e4332ba2f4a91d18f9c998f745fb40b521da40b31166fbaa14fa55a1592365bc37b36f7861996afd96976308f0dfab4b2
+MISC metadata.xml 1009 SHA256 10187b09ca0c473335745e32f62a9dfe56c78ab49c72de74b3ecb99631aa41fb SHA512 a852829c8272f45568a2c3c3e181ab22119a7f39ccbe15fdca9eb13a48bd4a1a95f1c1a0b69e2b29c917d32a7b9fd35e360f79ded2f7205dc2d58ea5984fb1a5 WHIRLPOOL 462000d2092e018032b211b6aab0f3b3b95c07ba366c18850216aad630eb025c7771d90d259df9d20fed889e2766b39393fbfa8a7b66cbb93e0188f08357e7b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/l9XwACgkQgAnW8HDreRZvZwCfTOxFvuWOa23ub6NN5HTeko0e
-jKoAn2LxOoib6uodhsh2sEWIvH197SUh
-=J1R2
+iEYEAREIAAYFAlAh5mYACgkQ1ycZbhPLE2AGwACfVUKGeQCKvl88SImVjpQO5iJU
+p3cAoKIM56xAo9qNlBZjHk0xEKV0NOnY
+=l5kC
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/mpb/files/mpb-1.4.2-gcc4.patch b/sci-physics/mpb/files/mpb-1.4.2-gcc4.patch
deleted file mode 100644
index 62536ac202db..000000000000
--- a/sci-physics/mpb/files/mpb-1.4.2-gcc4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur mpb-1.4.2/configure mpb-1.4.2-new/configure
---- mpb-1.4.2/configure	2003-03-03 21:39:25.000000000 -0500
-+++ mpb-1.4.2-new/configure	2006-11-07 08:19:13.000000000 -0500
-@@ -1343,7 +1343,7 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 gfortran
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -1385,7 +1385,7 @@
- fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 gfortran
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/sci-physics/mpb/files/mpb-1.4.2-guile18.patch b/sci-physics/mpb/files/mpb-1.4.2-guile18.patch
new file mode 100644
index 000000000000..9cb73a099b8b
--- /dev/null
+++ b/sci-physics/mpb/files/mpb-1.4.2-guile18.patch
@@ -0,0 +1,12 @@
+diff -Nur mpb-1.4.2.orig/mpb-ctl/field-smob.c mpb-1.4.2/mpb-ctl/field-smob.c
+--- mpb-1.4.2.orig/mpb-ctl/field-smob.c	2012-08-07 20:56:24.538452994 -0700
++++ mpb-1.4.2/mpb-ctl/field-smob.c	2012-08-07 20:56:43.713557380 -0700
+@@ -157,7 +157,7 @@
+ boolean cur_fieldp(SCM obj)
+ {
+      if (SCM_NIMP(obj) && SCM_SYMBOLP(obj)) {
+-	  char *s = gh_symbol2newstr(obj, NULL);
++	  char *s = gh_symbol2newstr(obj);
+ 	  int ret = !strcmp(s, "cur-field");
+ 	  free(s);
+ 	  return ret;
diff --git a/sci-physics/mpb/metadata.xml b/sci-physics/mpb/metadata.xml
index 36994b3229fd..4c409fb5d874 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
diff --git a/sci-physics/mpb/mpb-1.4.2-r2.ebuild b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
index 419310e881f8..0d43b115ac13 100644
--- a/sci-physics/mpb/mpb-1.4.2-r2.ebuild
+++ b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2012/06/23 16:57:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.6 2012/08/08 04:08:59 bicatali Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SRC_URI="http://ab-initio.mit.edu/mpb/${P}.tar.gz"
 HOMEPAGE="http://ab-initio.mit.edu/mpb/"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hdf5 mpi"
 
 SLOT="0"
@@ -30,18 +30,19 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-guile18.patch \
 		"${FILESDIR}"/${P}-headers.patch
 	cd "${S}"
 	eautoreconf
 	# version with inversion symmetry (mpbi).
-	cp -r "${S}" "${S}_inv"
+	cp -r "${S}" "${S}_inv" || die
 	# version with hermitian eps (mpbh).
-	cp -r "${S}" "${S}_herm"
+	cp -r "${S}" "${S}_herm" || die
 	# mpi versions (mpb-mpi).
 	if use mpi; then
-		cp -r "${S}" "${S}_mpi"
-		cp -r "${S}" "${S}_inv_mpi"
-		cp -r "${S}" "${S}_herm_mpi"
+		cp -r "${S}" "${S}_mpi" || die
+		cp -r "${S}" "${S}_inv_mpi" || die
+		cp -r "${S}" "${S}_herm_mpi" || die
 	fi
 	tc-export CC
 }
@@ -49,31 +50,34 @@ src_prepare() {
 src_configure() {
 	# enable legacy API for hdf-1.8
 	use hdf5 && append-cflags -DH5_USE_16_API
+	#
+	local myconf=(
+		--with-libctl="${EPREFIX}/usr/share/libctl"
+		--with-blas="$(pkg-config --libs blas)"
+		--with-lapack="$(pkg-config --libs lapack)"
+		$(use_with hdf5)
+	)
 
-	local myconf="$(use_with hdf5)"
-	export BLAS_LIBS="$(pkg-config --libs blas)"
-	export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
-	econf ${myconf}
+	econf "${myconf[@]}"
 
 	cd "${S}_inv"
-	econf ${myconf} \
+	econf "${myconf[@]}" \
 		--with-inv-symmetry
 
 	cd "${S}_herm"
-	econf ${myconf} \
+	econf "${myconf[@]}" \
 		--with-hermitian-eps
 
 	if use mpi; then
 		cd "${S}_mpi"
-		econf ${myconf} \
+		econf "${myconf[@]}" \
 			--with-mpi
 		cd "${S}_inv_mpi"
-		econf ${myconf} \
+		econf "${myconf[@]}" \
 			--with-inv-symmetry \
 			--with-mpi
 		cd "${S}_herm_mpi"
-		econf ${myconf} \
+		econf "${myconf[@]}" \
 			--with-hermitian-eps \
 			--with-mpi \
 			CC=mpicc
@@ -81,44 +85,41 @@ src_configure() {
 }
 
 src_compile() {
-	local dirs="${S} ${S}_inv ${S}_herm"
-	for d in ${dirs}; do
-		cd "${d}"
+	local d
+	for d in .  _inv _herm; do
+		cd "${S}${d}"
 		emake -C mpb-ctl ctl-io.c
 		emake
 	done
-	local dirs="${S} ${S}_inv ${S}_herm"
 	if use mpi; then
-		for d in ${dirs}; do
-			cd "${d}_mpi"
-			emake -C mpb-ctl ctl-io.c CC=mpicc || die
-			emake CC=mpicc LD=mpicc || die "emake in ${d}_mpi failed"
+		for d in .  _inv _herm; do
+			cd "${S}${d}_mpi"
+			emake -C mpb-ctl ctl-io.c CC=mpicc
+			emake CC=mpicc LD=mpicc
 		done
 	fi
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	einstall
 	dodoc README NEWS AUTHORS COPYRIGHT ChangeLog TODO
-
-	if use doc; then
-		dohtml doc/* || die
-	fi
+	use doc && dohtml doc/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r mpb-ctl/examples || die
+		doins -r mpb-ctl/examples
 	fi
 
-	newbin "${d}"/mpb-ctl/.mpb mpbi || die
-	newbin "${S}_herm"/mpb-ctl/.mpb mpbh || die
+	newbin "${S}_inv"/mpb-ctl/.mpb mpbi
+	newbin "${S}_herm"/mpb-ctl/.mpb mpbh
+
 	einfo "Several versions of mpb have been installed:"
 	einfo "mpb : regular version"
 	einfo "mpbi: configured for inversion symmetry"
 	einfo "mpbh: configured for hermitian epsilon"
 	if use mpi; then
-		newbin "${S}_mpi"/mpb-ctl/.mpb mpb-mpi || die
-		newbin "${S}_inv_mpi"/mpb-ctl/.mpb mpbh-mpi || die
-		newbin "${S}_herm_mpi"/mpb-ctl/.mpb mpbi-mpi || die
+		newbin "${S}_mpi"/mpb-ctl/.mpb mpb-mpi
+		newbin "${S}_inv_mpi"/mpb-ctl/.mpb mpbh-mpi
+		newbin "${S}_herm_mpi"/mpb-ctl/.mpb mpbi-mpi
 		einfo "mpb-mpi : regular version with mpi"
 		einfo "mpbi-mpi: configured for inversion symmetry with mpi"
 		einfo "mpbh-mpi: configured for hermitian epsilon with mpi"