[gentoo-commits] gentoo-x86 commit in sci-libs/mc: metadata.xml mc-1.5.ebuild ChangeLog

[Justin Lecher (jlec)]

jlec        12/02/28 12:57:17

  Modified:             metadata.xml mc-1.5.ebuild ChangeLog
  Log:
  Moved to autotools-utils, EAPI=4, fix blas/lapack detection and add USE=static-libs
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-libs/mc/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mc/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	1 Nov 2010 14:52:26 -0000	1.1
+++ metadata.xml	28 Feb 2012 12:57:17 -0000	1.2
@@ -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@g.o</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@g.o</email>
+	</maintainer>
 </pkgmetadata>



1.4                  sci-libs/mc/mc-1.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/mc-1.5.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/mc-1.5.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/mc-1.5.ebuild?r1=1.3&r2=1.4

Index: mc-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mc-1.5.ebuild	21 Jun 2011 15:12:17 -0000	1.3
+++ mc-1.5.ebuild	28 Feb 2012 12:57:17 -0000	1.4
@@ -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 @@
 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 @@
 	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 @@
 
 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 @@
 	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
 }



1.6                  sci-libs/mc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mc/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	21 Jun 2011 15:12:17 -0000	1.5
+++ ChangeLog	28 Feb 2012 12:57:17 -0000	1.6
@@ -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@g.o> 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@g.o> mc-1.4.ebuild, mc-1.5.ebuild:
   Add dependency on virtual/fortran