[gentoo-commits] gentoo-x86 commit in sci-libs/arpack: arpack-96-r2.ebuild ChangeLog

["Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>]

bicatali    11/01/24 21:04:56

  Modified:             arpack-96-r2.ebuild ChangeLog
  Log:
  Added missing lapack dependency, fixed some as-needed requirements for parpack in the patch, fixed a test. Also should fix bug #352602 and bug #345713
  
  (Portage version: 2.1.9.34/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 sci-libs/arpack/arpack-96-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?r1=1.20&r2=1.21

Index: arpack-96-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- arpack-96-r2.ebuild	1 Dec 2010 18:15:49 -0000	1.20
+++ arpack-96-r2.ebuild	24 Jan 2011 21:04:56 -0000	1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v 1.20 2010/12/01 18:15:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v 1.21 2011/01/24 21:04:56 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools toolchain-funcs
@@ -9,16 +9,17 @@
 HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/"
 SRC_URI="http://www.caam.rice.edu/software/ARPACK/SRC/${PN}${PV}.tar.gz
 	http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${PV}.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2
+	http://dev.gentoo.org/~bicatali/${P}-patches.tar.bz2
 	doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
 		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="mpi doc examples"
+IUSE="doc examples mpi static-libs"
 
 RDEPEND="virtual/blas
+	virtual/lapack
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -31,20 +32,20 @@
 }
 
 src_prepare() {
+	cd "${WORKDIR}"
 	epatch "${WORKDIR}"/${PN}-arscnd.patch
 	epatch "${WORKDIR}"/${PN}-autotools.patch
-
-	BLAS_LIBS="$(pkg-config --libs blas)"
+	cd "${S}"
 	# fix examples library paths
 	sed -i \
 		-e '/^include/d' \
-		-e "s:\$(ALIBS):-larpack ${BLAS_LIBS}:g" \
+		-e "s:\$(ALIBS):-larpack $(pkg-config --libs blas lapack):g" \
 		-e 's:$(FFLAGS):$(FFLAGS) $(LDFLAGS):g' \
 		EXAMPLES/*/makefile || die "sed failed"
 
 	sed -i \
 		-e '/^include/d' \
-		-e "s:\$(PLIBS):-larpack -lparpack ${BLAS_LIBS}:g" \
+		-e "s:\$(PLIBS):-larpack -lparpack $(pkg-config --libs blas lapack):g" \
 		-e 's:_$(PLAT)::g' \
 		-e 's:$(PFC):mpif77:g' \
 		-e 's:$(PFFLAGS):$(FFLAGS) $(LDFLAGS) $(EXTOBJS):g' \
@@ -54,7 +55,9 @@
 
 src_configure() {
 	econf \
-		--with-blas="${BLAS_LIBS}" \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_enable static-libs static) \
 		$(use_enable mpi)
 }
 
@@ -77,7 +80,7 @@
 		emake \
 			FC=mpif77 \
 			EXTOBJS="dpttr{f,s}.o" \
-			LDFLAGS="-L${S}/.libs -L${S}/PARPACK/.libs" \
+			LDFLAGS="${LDFLAGS} -L${S}/.libs -L${S}/PARPACK/.libs" \
 			pdndrv || die "emake pdndrv failed"
 		for p in 1 3; do
 			prog=pdndrv${p}



1.24                 sci-libs/arpack/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	9 Jul 2010 10:01:07 -0000	1.23
+++ ChangeLog	24 Jan 2011 21:04:56 -0000	1.24
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/arpack
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.23 2010/07/09 10:01:07 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.24 2011/01/24 21:04:56 bicatali Exp $
+
+  24 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> arpack-96-r2.ebuild:
+  Added missing lapack dependency, fixed some as-needed requirements for
+  parpack in the patch, fixed a test. Also should fix bug #352602 and bug
+  #345713
 
   09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> arpack-96-r2.ebuild:
   ppc64 stable wrt #318649