sci-chemistry/freeon: Fix blas/lapakc detection

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 193 insertions, 9 deletions

diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index 01f496ffb38b..c90b57da48bb 100644
--- a/sci-chemistry/freeon/ChangeLog
+++ b/sci-chemistry/freeon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/freeon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/freeon/ChangeLog,v 1.2 2014/08/10 20:28:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/freeon/ChangeLog,v 1.3 2014/10/26 19:12:07 jlec Exp $
+
+  26 Oct 2014; Justin Lecher <jlec@gentoo.org> freeon-1.0.8-r1.ebuild,
+  +files/freeon-1.0.8-blas.patch:
+  Fix blas/lapakc detection
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> freeon-1.0.8-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest
index 4bfcce6790ca..2edbc7b9ac65 100644
--- a/sci-chemistry/freeon/Manifest
+++ b/sci-chemistry/freeon/Manifest
@@ -1,14 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX freeon-1.0.8-blas.patch 5076 SHA256 387b50d28afddce2a132b7b78c9cc9ac8ed75d5e9fb29b1c7057047c2e4435a6 SHA512 89012c6f8583a8736344a7bfa74a64bbe1af793443b7255ccb1fd73366d44527ed40c6dc3124caff1af02f4e662227c66aeced8d8526dbd26bb7a50e294b5da3 WHIRLPOOL 689f9f8d8c4137156da18320bb48be2f9954de39fe8de97c0ac9e4dbc495c49027ad60a5b923168845ff13ab0d2e551f7351ef296f25f70730070050fe8565d4
 DIST freeon-1.0.8.tar.bz2 5957707 SHA256 ae14c1b640e4dcd9f18d2807f2debf9fc005b7451401e3e5d7b9dc76919f381d SHA512 1227f670a73b4ea39beb26e4136ad535e126ad17d66171c31b3bd403a3886eee150cda865806a2d9dad85646ccb086a6be4f645455eab24603cb064fb725efbd WHIRLPOOL b41a3b1e4bb152309a12ac0c4fec07c932809bb465af4b08cb76f6e0bf089c4d91682e1428c47d1adb449d153a1338cd3d540e860ca22774a299e21da44a16c1
-EBUILD freeon-1.0.8-r1.ebuild 715 SHA256 f5ab5aae16e832e573ccd82aceed123651c9c014d72032ff917a0ea51f73b163 SHA512 dfac4eb0e7852f0207560390c25f942c2cac6492068cd0e80503d9467faaca5ac1ac91545b2ae19cc820265e1f52fab18ebed2b32df79be732e14918cdefce3b WHIRLPOOL ad3ebff292fcb74409a6f336327d1413e90f229027ab1aae94c130366cf85bc5506c6865cf16a90c8c3a13c51ca5e6b251dc3ecfe4f3845340d7cabd04d12929
-MISC ChangeLog 508 SHA256 284a71bf281ef532d0c9eee28082feb820fb63d194bff6440bb67182c1cc20d7 SHA512 8c258dad75044fb43592a939d7ae63fbe9796bd41e10af2a81d97ac16f219d7c8075916fd340c5a87ccd6aa8c549328ac6fa855c08c10d6b7058e05f52f4657f WHIRLPOOL 11aad788bf67fdfd735df6f30ca16bd5fd9f27c0970466e0e953286a7c3bdda1f50de4738af80c43550d33478e2ddf3d056dd8136e64c3f8ba8e920685b1f277
+EBUILD freeon-1.0.8-r1.ebuild 756 SHA256 ecad33db5e34930b45e29e53ebd9e9774050bd8d68337026eeff15d692189001 SHA512 3b994ffcf18778d6b791cb7ca085068bd75ee90b09b70b90d0ca79950a4352b5aa5fa60316a2580d45b15e41cda670aa83b5e3aa8ac9fa99e34110f20024b654 WHIRLPOOL dc530bf3eb165e60f5654d5d317a0d00af5f69fa12796ca77250f177ad240d6fb90f4a0667ea9a9f45e566687b3d8a3609f8cf7e44f2da93e7415cca61017390
+MISC ChangeLog 640 SHA256 b2bb71c6e5048afc157d0b57d790f48cbe089becd2bc3f870ada10048ca0208f SHA512 28847bde291470c6bb4448168164efafeefe6bf74bd0d66cf1c685a4231f2ba224dd10ba1d5f06df50d5515860b6105d7b53739dd175530e6ca7be36d0671284 WHIRLPOOL d361151c57646e289a25eae14d77643d02e1d95a9cc27e7e9669119218963cc80e8a07d66614b57a8f19dc448e2d2b9259129fe7758431b5d549b4e5fd9a82ba
 MISC metadata.xml 424 SHA256 945473e9c2f38fb1633cf313e8f61e1858e75b2ae6d4ae7607dbf0fa7450ed35 SHA512 06b157cb9f42f1eed10b77bffd45197fe97b6879e2d1d283e3e989826e5beb05939a2e0131027c5655c5dca725ac79f4f837988f8eff3eda570c47ed202a0a54 WHIRLPOOL 8c70e8f33c61df764a2b0f5b84eee5cbd79c2acdfdf7a65409b272dba3526fdce3124abb3a3053d574f368444b2b2f6189005a9d30f70c5b3a43f2f430bc877a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1fEACgkQcaHudmEf86o1tgCfc6L2fPHU/0Ya5K/toGT4oHP8
-zG4AnR4Fibj/qr+TgBmzK+JBxtCzhS6u
-=TC2c
+iQJ8BAEBCgBmBQJUTUeMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/0AP/0fJZ9XEPOc/l/YU+SjQeZVm
+3UoeuZv+Z5XeE5w93d/tjpdJsL6HNXMImFqVMV5j3+Z1/QlTzeieh2sND05di45e
+lO5cv4xk6P8kznZaqBlX/Dlc4HBWpwHP5RDAZ/iqGVCKbIivr4viHzxJ3cEhQNEi
+u7ftR+JpjXBPKaOMaMJ/4NiZS7hcfd3GGujKUNBvNRq+PXk5XLpwm1n7NrNFGdXT
+Kyp7F6Ul81QDts6uFp1pIn2PjiP130gLr+ON/SiP2RNSM9tNf360UNkjuuTP/xvH
+CYS8fTGlHj1WVaPfJfm/ObIOe2vUrLmvkCQVIgHLD7j+klEi2mxcIsvnOjPYaKey
+iWqHCpnBZ4mgsVmCdeHQy8IdzRWcUv2lLbRzGCH4FtOGCCXQ0IB2phqb2N8iiZrs
+p6iuAS3U6g4aFzd4jWBa8lPmc+XF4DcuSwqWwpxT6lDNsCoBUIhR+IS01pkaidcj
+D3pG4n/e8LCAleNn8yOhC4+sGtXmK3bZHM3cJUbMss+aaVANay0aDX7Yq6LmZNqw
+/HIq0z15QiGngmMlk7C+UzGKEZUFxRbM00GFgGlMw+q9htV6+lhw7N4fqlnvsOBT
+tU+EB38XhH9Sin06HIfqrYuag6GLKnufskhuvoWuaXmSaq+sQ9YvkbjBdyBHT6OS
+kL8vhXwKlnFT6pMAfbgi
+=9XGW
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/freeon/files/freeon-1.0.8-blas.patch b/sci-chemistry/freeon/files/freeon-1.0.8-blas.patch
new file mode 100644
index 000000000000..46fca7fa2a52
--- /dev/null
+++ b/sci-chemistry/freeon/files/freeon-1.0.8-blas.patch
@@ -0,0 +1,165 @@
+ FreeON/Makefile.am |  2 +-
+ HiCu/Makefile.am   |  2 +-
+ ONX/Makefile.am    |  1 +
+ OneE/Makefile.am   |  2 +-
+ QCTC/Makefile.am   |  2 +-
+ SCFeqs/Makefile.am |  2 +-
+ configure.ac       | 12 ++++++++----
+ make.inc           |  2 +-
+ tests/Makefile.am  |  8 ++++----
+ tools/Makefile.am  |  2 +-
+ 10 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/FreeON/Makefile.am b/FreeON/Makefile.am
+index 18e0283..12db056 100644
+--- a/FreeON/Makefile.am
++++ b/FreeON/Makefile.am
+@@ -50,7 +50,7 @@ FreeON_DEPENDENCIES = $(LIBRARY_DEPENDENCY_FILES)
+ 
+ SOURCES_DEPCHECK = $(FreeON_SOURCES)
+ 
+-FreeON_LDADD = $(LDADD_MODULES)
++FreeON_LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ AM_CPPFLAGS += \
+   -DFREEON_BASISSETS=\"$(datadir)/$(PACKAGE)/BasisSets\" \
+diff --git a/HiCu/Makefile.am b/HiCu/Makefile.am
+index 1847354..cc4ebef 100644
+--- a/HiCu/Makefile.am
++++ b/HiCu/Makefile.am
+@@ -27,7 +27,7 @@ EXTRA_DIST = \
+   MMA/CubeRules/RuleD.Inc \
+   MMA/CubeRules/RuleE.Inc
+ 
+-LDADD = $(LDADD_MODULES)
++LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ EXTRA_INCLUDES = -I$(top_srcdir)/Modules/MMA/Functionals
+ AM_CPPFLAGS += -DRULE7 -DEXPLICIT_SOURCE
+diff --git a/ONX/Makefile.am b/ONX/Makefile.am
+index 4d25029..b27b149 100644
+--- a/ONX/Makefile.am
++++ b/ONX/Makefile.am
+@@ -61,6 +61,7 @@ EXTRA_INCLUDES = \
+ 
+ LDADD = \
+   $(LDADD_MODULES) \
++  $(LAPACK_LIBS) \
+   $(builddir)/../TwoE/libfreeonTwoE.la
+ 
+ # In case we have ctags installed, make the necessary tags files.
+diff --git a/OneE/Makefile.am b/OneE/Makefile.am
+index 784bede..ea86ae7 100644
+--- a/OneE/Makefile.am
++++ b/OneE/Makefile.am
+@@ -46,7 +46,7 @@ EXTRA_DIST = \
+   MMA/QQuad32.Inc \
+   MMA/QQuad64.Inc
+ 
+-LDADD = $(LDADD_MODULES)
++LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ EXTRA_INCLUDES = -I$(srcdir)/MMA
+ 
+diff --git a/QCTC/Makefile.am b/QCTC/Makefile.am
+index 3ec39f0..53c358c 100644
+--- a/QCTC/Makefile.am
++++ b/QCTC/Makefile.am
+@@ -105,7 +105,7 @@ EXTRA_DIST = \
+   PBCTensor/Majik_Kubic_WS2.Inc
+ 
+ EXTRA_INCLUDES = -I$(top_builddir)/OneE -I$(top_srcdir)/Modules/MMA/LookUpTables_800_6x
+-LDADD = $(LDADD_MODULES) libktrax.la
++LDADD = $(LDADD_MODULES) libktrax.la $(LAPACK_LIBS)
+ 
+ # In case we have ctags installed, make the necessary tags files.
+ .PHONY : tags
+diff --git a/SCFeqs/Makefile.am b/SCFeqs/Makefile.am
+index 2ee640f..709f220 100644
+--- a/SCFeqs/Makefile.am
++++ b/SCFeqs/Makefile.am
+@@ -57,7 +57,7 @@ SOURCES_DEPCHECK = \
+   $(P2Use_SOURCES) \
+   $(DIIS_SOURCES)
+ 
+-LDADD = $(LDADD_MODULES)
++LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ # In case we have ctags installed, make the necessary tags files.
+ .PHONY : tags
+diff --git a/configure.ac b/configure.ac
+index e0c6a77..726c880 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -784,12 +784,16 @@ END PROGRAM test_compiler
+                   you use a version >= 4.2.0])])
+ 
+ # Check for BLAS.
+-AC_SEARCH_LIBS([dgemm], [blas], [],
+-  [AC_MSG_FAILURE([specify the location of dgemm()])])
++PKG_CHECK_MODULES([BLAS],[blas],[],
++  AC_SEARCH_LIBS([dgemm], [blas], [],
++    [AC_MSG_FAILURE([specify the location of dgemm()])])
++  )
+ 
+ # Check for LAPACK.
+-AC_SEARCH_LIBS([dsyev], [lapack], [],
+-  [AC_MSG_FAILURE([specify the library that contains dsyev()])])
++PKG_CHECK_MODULES([LAPACK],[lapack],[],
++  AC_SEARCH_LIBS([dsyev], [lapack], [],
++    [AC_MSG_FAILURE([specify the library that contains dsyev()])])
++  )
+ 
+ AC_ARG_VAR([H5CC], [h5cc compiler wrapper command])
+ 
+diff --git a/make.inc b/make.inc
+index cf35e40..5766ff9 100644
+--- a/make.inc
++++ b/make.inc
+@@ -9,7 +9,7 @@ AM_CPPFLAGS = @AM_CPPFLAGS@
+ # Fix for bug in autoconf-2.59
+ builddir = .
+ 
+-LDADD_MODULES = $(top_builddir)/Modules/libfreeonmodules.la
++LDADD_MODULES = $(top_builddir)/Modules/libfreeonmodules.la $(LAPACK_MODULES)
+ 
+ # On filesystems which are case-insensitive (which really means HFS+ on OS X)
+ # we can not preprocess into a filename that differs by the case only, i.e. .C
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6bd89f2..ae9da60 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -7,16 +7,16 @@ noinst_PROGRAMS = \
+   sendReceive_HGRho
+ 
+ sleeper_SOURCES = sleeper.F90
+-sleeper_LDADD = $(LDADD_MODULES)
++sleeper_LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ lock_SOURCES = lock.F90
+-lock_LDADD = $(LDADD_MODULES)
++lock_LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ sendReceive_DBL_RNK2_SOURCES = sendReceive_DBL_RNK2.F90
+-sendReceive_DBL_RNK2_LDADD = $(LDADD_MODULES)
++sendReceive_DBL_RNK2_LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ sendReceive_HGRho_SOURCES = sendReceive_HGRho.F90
+-sendReceive_HGRho_LDADD = $(LDADD_MODULES)
++sendReceive_HGRho_LDADD = $(LDADD_MODULES) $(LAPACK_LIBS)
+ 
+ if HAVE_MPIRUN
+ MPI_TESTS = locktest
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index e0baaff..a6b18b2 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -19,7 +19,7 @@ python_PYTHON = \
+ bin_PROGRAMS = printBCSR convertBCSR
+ 
+ printBCSR_SOURCES = printBCSR.F90
+-printBCSR_LDADD = $(top_builddir)/Modules/libfreeonmodules.la
++printBCSR_LDADD = $(top_builddir)/Modules/libfreeonmodules.la $(LAPACK_LIBS)
+ 
+ convertBCSR_SOURCES = \
+   convertBCSR.cc \
diff --git a/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild b/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild
index f63e1b1a0f29..e8f20fb85450 100644
--- a/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild
+++ b/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild,v 1.2 2014/08/10 20:28:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild,v 1.3 2014/10/26 19:12:07 jlec Exp $
 
 EAPI=5
 
@@ -25,3 +25,5 @@ RDEPEND="
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}"/${P}-blas.patch )