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

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 158 insertions, 5 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/Manifest b/sci-libs/arpack/Manifest
index 1540f6a46531..82c810260880 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX arpack-3.1.2-pkg-config.patch 1278 SHA256 635565836cc2156eb577ba67f4910fb95a5c2b7fa0d7fbab2ef849bdff2d300a SHA512 c8ee73c3d5c2033604f128b836c50a09266b12e57150ff321f4c0c6a796dc4aa24662982020f69594d70b7a895b5c83fe8dc9494f712c37b6395fb3d81b809f9 WHIRLPOOL 933dcb3bf202fa0c43e868dc6a159398e32eabb395564409115c19d8c6dc33cdf6c83c10d7c0645f8d909b317026118e05b09f95f047d69fbc8fdfe6f4886a94
 AUX arpack-3.1.2-test.patch 1472 SHA256 28df2f0146810feefbbf8c703f74b68d03a89bc5025456ec0cd5a67cafa741a3 SHA512 8f43bf145b0b510f1d4aa47985fc51a22103772973c53739a6c776eb86480ca8fc7e5f0492924f989aa0eeb42697200cd8ee22df8771a222f985fa02d1045c2f WHIRLPOOL 802adf79984b969604584e7f2c2489e9ca54d15b98ad3bfa9dba86b6af2a29a7ce99e57a2335864477742e8cfbcc119cf983276dc34d63240ad207958ea35284
 DIST arpack-96-patches-2.tar.bz2 504621 SHA256 ecb2aa94feff0ff6d9df3416c205d3c3715073e6abaa58dc3a39786ca7e686fc SHA512 5f661198730fb5dd5d79d02d01cef9abb09f4b3f3bf29586ff65cfbb7d257f99ae4386381ecc2bafba25e59d9fc4a0d1ab1adbce103434ff94e5694333ee15da WHIRLPOOL fc62cc4eb78647ff0b45ff4a10599ca54036c0c60f45840a48a5009b36754e60ee0eb8bbf87fe8c8c854c8b0db8ca6ce023649cbd5b33b4c8569f48d3dc180fb
 DIST arpack-ng_3.1.2.tar.gz 1299556 SHA256 9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2 SHA512 ddf07c83a4b5230822c6ed709d9a18cd01fef78826602d4876fa7dc3e6c4b90e3581519eb50601b8c62023db7610a92ef5dd568c385fde4942cfe0a501e4cc9c WHIRLPOOL 29614e2f0b6b5fea87aa655c217c4f46f32b83f0b4286c7f07395f8d97c6fc7a391c2476cbd269a6236a4ea39f4a9aa9dde2a76cce115ae30ea01bad7a659df7
@@ -9,13 +10,14 @@ DIST parpack96.tar.gz 509316 SHA256 3b6a1ceec06f14e2a06c323721baa908c2f7823d1da7
 DIST tutorial.ps.gz 105599 SHA256 2f745fe80b0a4fcdf1c273995ed67bc6cf03684ccbaa44442ad1187ea41b81c0 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4 WHIRLPOOL 6e1f6901c81993371731861b8c617f9ef22b602e737b3102c2107713b3201362ddd48205aac5814e3a157549f4fa5f280d18e7b84afc8edeadb93d10d8bda5c9
 DIST ug.ps.gz 248543 SHA256 ff1faac74bfc42442955906132756ecd7f0034803898d507dbd1bc960f6f4ab0 SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328 WHIRLPOOL 83db17d8b1c49d532ca6f4412d110b1973323da5bb526804ab779bc143cf84d8270655b306822e04fa64290f531ed2c4f1e74ffbccbf76529991203e869ca6df
 EBUILD arpack-0.96-r3.ebuild 3247 SHA256 b1ca77d609e1ca843137b122143e4158b7369cdf231d25e2a537fa1a394685d6 SHA512 83b19de4f95d6ee4d930e86944a312b1767620fdd3f7cd7378a446520cbcb9aaee401a4292e2aa6670bd7c6d9f0aee79af57a2766063a5aafb54104bfecdcf22 WHIRLPOOL 3105eefb4529111ac64890f04b65655a0192125f07486052e1e58918102f5deb68793069d9d44bea5c9634275704863ec6f65f1cd0e797e5792a5389db5da92f
+EBUILD arpack-3.1.2-r1.ebuild 2362 SHA256 2b02ffe60a5278a3e4c604c53e8ce967b47a05f920cc1dab3b9b268851ac6b5b SHA512 d2bdaa9cc760c9f4f8b5f5a5fc91234f6f7079a0fa42518d92b3d40701c2a079bc91327374e8c75305f31bd010a94ec05e4d47f51690f87e7203bcc8ddcdb1e5 WHIRLPOOL a3cdf1c165773a255b9c5f199d3c436526f99c8516ec42823a14887cb2b614e66c9a05964de68f000209c8f955da85f17e2908cbbbd5e3cc537b202f06aa0dd8
 EBUILD arpack-3.1.2.ebuild 2299 SHA256 709bf30014ebd7b868998e710164cffab14817dcf5c5ebf3c3c2c699e4dcd1ae SHA512 92b989ae0202b435c8666086c46d7d27a38c8f8f4a0a8922b3245a0e800594944cc99bc131bf6c2e3ee62a0bd5595662b40d42b27541d7e23cb75f6ed55c45f3 WHIRLPOOL b8a28e5afd70dbefc2db0ac264538231d93059031bb2c3016bc434438619391a5f964fa7426353f2ebd248e77a3569b41f05ed4f51c60f3e402ae39d8fd1614c
-MISC ChangeLog 7664 SHA256 4e6323b3963849f06588c91acb6aae8f565ceee186a646012fa7893b491e04ff SHA512 f31ee922045c753155a6edf5cfd61ef28ee21b6ec1ed440695dd0cc931c87e779d394c22b1713efb422dbf7130427832bf3745158486873305bab1cd9e916274 WHIRLPOOL 98deb187e6d2bce726d4186ad0558e28c3d1e09436cf3264b6455720a5ec459da296f910341d7f3b8579019c79e06c2798197ffb4a3961bb6bfde68a4bc3d463
+MISC ChangeLog 7873 SHA256 1660cbd36af3705f09859e55fbbbe485b51f21429df8451f18a5dbc53d46964f SHA512 6d28788a0b658590ebacdf4b4a8998e495bd75bfee67d7acf25541f9e5bae0dc3a8975860756af402de77b4a1c8d0239863c195330ef3b0a821af4516948c679 WHIRLPOOL 6e4bce5388182de0a705aaa6b8706339315fd82305177a6da1b3c17067cf8b2ac2427a848862ac9a6918454fbd6ea829fd1654f9a926b32cf07d05a8336decc8
 MISC metadata.xml 782 SHA256 82dcbb6ce1c31fb43d82504472ad58c6bac49940c37a1595cc277ae5e7a98b6c SHA512 69dee866acdbd5075d38e4494622ec2bf3e934e48683aa5bfe6183bb89f18b19777132644fe1970f877ffa71e931cb0cd966ed52140826db2d83cbfb9eb22802 WHIRLPOOL 46fcc15dcabc5c9950ef31f485ac6b4d75bc581ebd87bf04c1ebf5f608c23ccfc846e45ac10863fcddb7c028b34776cd8c4514f308dca408ab2806b004c71763
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEmQK0ACgkQgAnW8HDreRbtyQCfSVLdjGl2KQxZHXjWs0uaOFVe
-7sIAn3hgVhG7FfM4byNXFYLeEpuuzqyt
-=mWuS
+iEYEAREIAAYFAlEmUGsACgkQgAnW8HDreRaXMwCgr9EjMGwXHqQhWgvxrIotKhEj
+4d4AmQHxvOyfst2TzO+nMdon+9jtPLBd
+=BiM8
 -----END PGP SIGNATURE-----
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