Moved to autotools-utils, EAPI=4, fix blas/lapack detection and add USE=static-libs

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

5 files changed, 106 insertions, 38 deletions

diff --git a/sci-libs/mc/ChangeLog b/sci-libs/mc/ChangeLog
index bc7d34a6fc48..a9ad59fdcc91 100644
--- a/sci-libs/mc/ChangeLog
+++ b/sci-libs/mc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/ChangeLog,v 1.5 2011/06/21 15:12:17 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/ChangeLog,v 1.6 2012/02/28 12:57:17 jlec Exp $
+
+  28 Feb 2012; Justin Lecher <jlec@gentoo.org> mc-1.5.ebuild,
+  +files/mc-1.5-unbundle.patch, metadata.xml:
+  Moved to autotools-utils, EAPI=4, fix blas/lapack detection and add
+  USE=static-libs
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> mc-1.4.ebuild, mc-1.5.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest
index efaecd1da623..8c460185e629 100644
--- a/sci-libs/mc/Manifest
+++ b/sci-libs/mc/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.4-doc.patch 526 RMD160 9b3cd48b6b319b1a30c156aa3e14cb6f753b55d4 SHA1 eac89bc5c3a65244f33f5d97172ea814c33294f9 SHA256 d1459adc32d7a4c987cbba795935e199939c66a81649ca21159c2d632c9cc408
 AUX 1.4-multilib.patch 693 RMD160 cbc1859370d49aa240215a2580d89a42b98ecbb8 SHA1 134917a0258d3fb71c0e19a1e57db41950c45d07 SHA256 c12e7f95d5ecc9d3bdd6b2d25b0660b63b8ed08d557c7653d89f23b576817aa8
 AUX 1.4-overflow.patch 426 RMD160 7c22e306c37c693c7e93f958c6aa497c43b894fb SHA1 d8ed633462b347d56cbb9428807f249682be4f2f SHA256 3ea566138dccc904747021f909d553254e9ff0f7064ea5cffd74b20df678c0bd
 AUX 1.4-superlu.patch 695 RMD160 4318c21aabd86b2f0677488af486a30ea52b9538 SHA1 1f8de9615227c96a886bd10738c097e63ef8e3d3 SHA256 df3feabb7b2bb78973b4e0b85b9382e742f69f1966be6d6e61c418047c87d99e
+AUX mc-1.5-unbundle.patch 1825 RMD160 a08e323260973bdc52d5653d5336a2e14b0c4d51 SHA1 a5117c65a955759a9cb07024dd0be71cda5e2259 SHA256 c0137c8a4627dd9e30564aeee833f5044401be9a2b73c0771baec01470aaa32b
 DIST mc-1.4.tar.gz 16304707 RMD160 06ef87fdf214509b94a3a79370f9dbb28e8755ae SHA1 32369cc980e95296c10f9461df791e4f6b5b9765 SHA256 c5768055eb0fbccac620494e46708a7a0aef7ffc34f2b98efb8fce1b953e4e93
 DIST mc-1.5.tar.gz 18140539 RMD160 4d4b3bf06bd77929466bb6015a31233b2e9c1b44 SHA1 ee33246e3d29b33911086acb94792a644f48a575 SHA256 a149d833d41362916583dca7561248281a79c8a8167b5329a24d7f3f23df05e1
 EBUILD mc-1.4.ebuild 1972 RMD160 36ae132c50409e1de2f7532571f5450ad662575d SHA1 8f9f76adebd57f15b0ae6152a3c7c20a7a7349dc SHA256 b09309c767eb092f8ced0f29ac4ddfdd8083d8262ca1d7bd6c5abe9ec3587f1a
-EBUILD mc-1.5.ebuild 1964 RMD160 ea11ae7efb54369b067cd944ff912a5213031e93 SHA1 fbdb49d341a5e37abff5e72d7572d6462bd2aceb SHA256 569cd66215e4e32a1facc249fb6a84e7ddedbef1045092c6711701c7aef95d1e
-MISC ChangeLog 959 RMD160 5314dc05e456824c51bea0b8ed8683f608060242 SHA1 a0668f42c7d9a175170b9e9e8bd4e9d9ce1b4d82 SHA256 930429df02df1bb09df7ea85c38a3d18d0a7f2b71c29bc5822a0def70042f1d6
-MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
+EBUILD mc-1.5.ebuild 2043 RMD160 879e38855814768d635319801c38845d8d987504 SHA1 f9da59d83b67cfaeb2673ba844c44d612ff2434a SHA256 7e21e569689e85280d36681965605979cf827971217653ced07bfe72e8dbaf0c
+MISC ChangeLog 1156 RMD160 7754076c3fbaeecd0b0a6f88a0461f88552a8a58 SHA1 29693b50e954c0658309232aff3bcc37c5cf285e SHA256 984df90ba15b42f10736472e27d4e18c740318a88554a71b54224cadbf5aec7a
+MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4AtNIACgkQgAnW8HDreRZtVwCfdAjRfFIApXs+erIUVVQ6cQMk
-00oAn3ALsleydu6xSm9tcxrKQ6qQoH+f
-=KesU
+iEYEAREKAAYFAk9MzzIACgkQgAnW8HDreRbo8ACcCQPhSV4xqp2h+xiCnT+JerDJ
+Vt0AoJEfuhzCyC+GIUrUhEFIEN7GHKdH
+=A/DW
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mc/files/mc-1.5-unbundle.patch b/sci-libs/mc/files/mc-1.5-unbundle.patch
new file mode 100644
index 000000000000..5a9a97241980
--- /dev/null
+++ b/sci-libs/mc/files/mc-1.5-unbundle.patch
@@ -0,0 +1,58 @@
+ configure.ac |   38 ++++++--------------------------------
+ 1 files changed, 6 insertions(+), 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6198ac0..4b1b169 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -191,44 +191,18 @@ dnl # -----------------------
+ dnl # HANDLE THE BLAS LIBRARY
+ dnl # -----------------------
+ blas_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_BLAS_LIBRARY])
+-if test -n "${FETK_BLAS_LIBRARY}"; then
+-    AC_MSG_RESULT([yes])
+-    blas_lib_path="-L${FETK_BLAS_LIBRARY} ";
+-else
+-    AC_MSG_RESULT([no])
+-    blas_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${blas_lib_path};
+-blas_use="";
+-AC_CHECK_LIB(blas,dscal_,
+-    [blas_use="yes";blas_lib="${blas_lib_path}-lblas";AC_DEFINE(HAVE_BLAS)],
+-    [blas_use="";blas_lib=""],
+-    [${blas_lib_path}-lblas ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++blas_lib_path="";
++PKG_CHECK_MODULES([BLAS], [blas])
++blas_lib="${BLAS_LIBS}";
+ AC_SUBST(blas_lib)
+ 
+ dnl # -------------------------
+ dnl # HANDLE THE LAPACK LIBRARY
+ dnl # -------------------------
+ lapack_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_LAPACK_LIBRARY])
+-if test -n "${FETK_LAPACK_LIBRARY}"; then
+-    AC_MSG_RESULT([yes])
+-    lapack_lib_path="-L${FETK_LAPACK_LIBRARY} ";
+-else
+-    AC_MSG_RESULT([no])
+-    lapack_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${lapack_lib_path};
+-lapack_use="";
+-AC_CHECK_LIB(lapack,dsysv_,
+-    [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack";AC_DEFINE(HAVE_LAPACK)],
+-    [lapack_use="";lapack_lib=""],
+-    [${lapack_lib_path}-llapack ${blas_lib} ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++lapack_lib_path="";
++PKG_CHECK_MODULES([LAPACK], [lapack])
++lapack_lib="${LAPACK_LIBS}"
+ AC_SUBST(lapack_lib)
+ 
+ dnl # --------------------------
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index 722e00a4d8e7..0339acc531f3 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v 1.3 2011/06/21 15:12:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v 1.4 2012/02/28 12:57:17 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit autotools eutils fortran-2 multilib
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fortran-2 multilib
 
 DESCRIPTION="2D/3D AFEM code for nonlinear geometric PDE"
 HOMEPAGE="http://fetk.org/codes/mc/index.html"
@@ -13,7 +15,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-IUSE="debug doc"
+IUSE="debug doc static-libs"
 
 RDEPEND="
 	virtual/fortran
@@ -24,7 +26,9 @@ RDEPEND="
 	sci-libs/gamer
 	sci-libs/punc
 	sci-libs/superlu
-	sci-libs/umfpack"
+	sci-libs/umfpack
+	virtual/blas
+	virtual/lapack"
 DEPEND="
 	${RDEPEND}
 	doc? (
@@ -33,26 +37,29 @@ DEPEND="
 
 S="${WORKDIR}"/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/1.4-superlu.patch
+	"${FILESDIR}"/1.4-overflow.patch
+	"${FILESDIR}"/1.4-multilib.patch
+	"${FILESDIR}"/1.4-doc.patch
+	"${FILESDIR}"/${P}-unbundle.patch
+	)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/1.4-superlu.patch \
-		"${FILESDIR}"/1.4-overflow.patch \
-		"${FILESDIR}"/1.4-multilib.patch \
-		"${FILESDIR}"/1.4-doc.patch
 	sed \
 		-e 's:AMD_order:amd_order:g' \
 		-e 's:UMFPACK_numeric:umfpack_di_numeric:g' \
 		-e 's:buildg_:matvec_:g' \
 		-i configure.ac || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local fetk_include
 	local fetk_lib
-	local myconf
+	local myeconfargs
 
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
 
 	fetk_include="${EPREFIX}"/usr/include
 	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
@@ -69,14 +76,11 @@ src_configure() {
 	export FETK_CGCODE_LIBRARY="${fetk_lib}"
 	export FETK_PMG_LIBRARY="${fetk_lib}"
 
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable debug vdebug) \
-		--disable-triplet \
-		--enable-shared \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
+	myeconfargs+=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug vdebug)
+		--disable-triplet
+		--enable-shared
+	)
+	autotools-utils_src_configure
 }
diff --git a/sci-libs/mc/metadata.xml b/sci-libs/mc/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-libs/mc/metadata.xml
+++ b/sci-libs/mc/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</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>