sci-libs/arpack: Fix pkgconfig file and its creation. Hopefully fixes, #455862

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 152 insertions, 1 deletions

diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index ec39508797e8..a9db4d2e4a93 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/arpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.49 2013/02/21 15:43:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.50 2013/02/21 16:50:49 jlec Exp $
+
+*arpack-3.1.2-r1 (21 Feb 2013)
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> +arpack-3.1.2-r1.ebuild,
+  +files/arpack-3.1.2-pkg-config.patch:
+  Fix pkgconfig file and its creation. Hopefully fixes, #455862
 
   21 Feb 2013; Justin Lecher <jlec@gentoo.org> arpack-0.96-r3.ebuild,
   metadata.xml:
diff --git a/sci-libs/arpack/arpack-3.1.2-r1.ebuild b/sci-libs/arpack/arpack-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..967b834c8503
--- /dev/null
+++ b/sci-libs/arpack/arpack-3.1.2-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.2-r1.ebuild,v 1.1 2013/02/21 16:50:49 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
+HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/"
+SRC_URI="
+	http://forge.scilab.org/upload/arpack-ng/files/${PN}-ng_${PV}.tar.gz
+	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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc examples mpi static-libs"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[fortran] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-ng_${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-test.patch
+	)
+
+src_configure() {
+	local myeconfargs=(
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_enable mpi)
+		)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test
+	pushd "${S}"/EXAMPLES/SIMPLE
+	touch ../../ARmake.inc
+	emake simple FC=$(tc-getFC) LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs"
+	local prog=
+	for p in ss ds sn dn cn zn; do
+		prog=${p}simp
+		LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs" ./${prog} \
+			|| die "${prog} test failed"
+		rm -f ${prog} *.o || die
+	done
+	popd
+
+	if use mpi; then
+		pushd "${AUTOTOOLS_BUILD_DIR}"/PARPACK/EXAMPLES/MPI
+		emake \
+			FC=mpif77 \
+			LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs -L${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs ${LIBS}"
+		for p in 1 3; do
+			prog=pdndrv${p}
+			LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs:${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs" \
+				./${prog} || die "${prog} test failed"
+			rm -f ${prog} *.o || die
+		done
+		popd
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	dodoc DOCUMENTS/*.doc
+	newdoc DOCUMENTS/README README.doc
+	use doc && dodoc "${WORKDIR}"/*.ps
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r EXAMPLES
+		if use mpi; then
+			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
+			doins -r PARPACK/EXAMPLES/MPI
+		fi
+	fi
+}
diff --git a/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch b/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch
new file mode 100644
index 000000000000..92399140a424
--- /dev/null
+++ b/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch
@@ -0,0 +1,55 @@
+ arpack.pc    |  9 ---------
+ arpack.pc.in | 10 ++++++++++
+ configure.ac |  3 ++-
+ 3 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/arpack.pc b/arpack.pc
+deleted file mode 100644
+index b630b77..0000000
+--- a/arpack.pc
++++ /dev/null
+@@ -1,9 +0,0 @@
+-prefix=/usr
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-
+-Name: arpack
+-Description: ARPACK-NG 
+-Version: 3.0.2
+-Libs: -L${libdir} -larpack -lblas
+-Cflags: 
+diff --git a/arpack.pc.in b/arpack.pc.in
+new file mode 100644
+index 0000000..36fa4ff
+--- /dev/null
++++ b/arpack.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++
++Name: arpack
++Description: ARPACK-NG 
++Version: @VERSION@
++Libs: -L${libdir} -larpack
++Libs.private: @BLAS_LIBS@
++Cflags: 
+diff --git a/configure.ac b/configure.ac
+index 95c65b8..fe94be9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ(2.59)
+-AC_INIT([arpack-ng], [3.1.0], [http://forge.scilab.org/index.php/p/arpack-ng/issues/])
++AC_INIT([arpack-ng], [3.1.2], [http://forge.scilab.org/index.php/p/arpack-ng/issues/])
+ AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ 
+@@ -42,6 +42,7 @@ AM_CONDITIONAL(MPI, test x"$enable_mpi" = x"yes")
+ #	LAPACK/Makefile
+ 
+ AC_CONFIG_FILES([
++	arpack.pc
+ 	Makefile
+ 	SRC/Makefile
+ 	UTIL/Makefile