Correct linking against bicatalis new atlas version

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 52 insertions, 13 deletions

diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog
index 54cf1a1c0005..d6b96de5d33a 100644
--- a/sci-libs/libcmatrix/ChangeLog
+++ b/sci-libs/libcmatrix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libcmatrix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.3 2011/04/12 06:34:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.4 2011/04/21 06:38:32 jlec Exp $
+
+  21 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-atlas.patch,
+  files/3.2.1-shared.patch, libcmatrix-3.2.1.ebuild:
+  Correct linking against bicatalis new atlas version
 
   12 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-gcc4.6.patch,
   libcmatrix-3.2.1.ebuild:
diff --git a/sci-libs/libcmatrix/Manifest b/sci-libs/libcmatrix/Manifest
index 657688ef81ef..6046ae199a24 100644
--- a/sci-libs/libcmatrix/Manifest
+++ b/sci-libs/libcmatrix/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 3.2.1-atlas.patch 1236 RMD160 025515694d147603905da15df43cebaa645dc3ef SHA1 933e60b763e634c954cfcbe95d1c37b086b2fba9 SHA256 63598c6d7d4cf3687d3dc1c49d736b5fbe0cb552fbdfd53151bccdd96ca35a34
 AUX 3.2.1-gcc4.4.patch 286 RMD160 8b275ad714b6bedbff03e411187342406f5cf1a7 SHA1 52873e8ef3197148d6c4ddfe0155a3cbfe4fd3db SHA256 e6eff8c9be0f9ac9026d1c00841e81a3f2e00127cbb70bd6e117de262e262fb3
 AUX 3.2.1-gcc4.6.patch 616 RMD160 5c08d0fad7f79cfe8d1c5577d0983f0f04d70c01 SHA1 9245459b34251206cb08595bab96914482c7a8c5 SHA256 fa7a4db6b1899a7a85fa6cd87f0d97ea6330ffc33787039d02330440dbdc30cb
 AUX 3.2.1-minuit2.patch 588 RMD160 7bfc835d79915342e6fdb209cfff29e0e8692bbc SHA1 374e8b92a1263ab488089303c6cbb46a28e7929f SHA256 099d47445e6efb340831b4a1f6210b02eb2a2ccf6f680f982761defcadfd1962
-AUX 3.2.1-shared.patch 2626 RMD160 3227ea97a22750309d7e1d27aae276adc62c68d8 SHA1 5affbd06480e9fa95d44aae99c1665b9ff631cc6 SHA256 23983f6986b13cb31df7157e22932538cd73d4d2e2b806d42fa4a0df644b6df6
+AUX 3.2.1-shared.patch 2678 RMD160 d7f289d7845364211f4398b37891b90bdff1dfd2 SHA1 794f48aaf9de460307e235a6108d09a43f644121 SHA256 611c4bb56ed43b18e194620550b99e22d2b37f1475a18eaee1b01df96dda9b99
 DIST libcmatrix-3.2.1.tar.gz 1151322 RMD160 d5f41d7fde34039482e3c971ecff84177ba5c064 SHA1 4612d4d0be34566bca83fe8b8a17033cd0457375 SHA256 6b4cb3ae4e1ed0a33190b09cd15a72c0938e3b598dbda39ca1557b482731b5c4
-EBUILD libcmatrix-3.2.1.ebuild 1141 RMD160 3ef557fb8ecb352dd641e226360b71cb8809d24b SHA1 4d4adeac5d4c1d16e885680d045f721302c1dfbd SHA256 b10a9db8cf1ff7e830c90cb0c5cf2bde4e5a50ae4f0443f12786b5e7fd90e9e1
-MISC ChangeLog 724 RMD160 687d3d2d4cd6d08283cc5110bbd0a4b9c940d407 SHA1 16433286872418fdd940ccc339c9bbed81b9d945 SHA256 cd7796a8d6055170775f19751dc2ec9f6d40309f18dac4bde86e27fc7c3959c7
+EBUILD libcmatrix-3.2.1.ebuild 1177 RMD160 c9a6b8d1b97c79ef67414372161685d680009780 SHA1 2edaa9916e01499ea61555c8718cf18a1fb8a893 SHA256 80dd189e6503651e1e29dbb152cfc1ea21a1c7ff00395b8a130ed2658b610374
+MISC ChangeLog 905 RMD160 74b8f41f2d22a5bb5fe7ab617c48485e41c911d8 SHA1 693250dbcd525be2cb35c1f7a5e7991943971c08 SHA256 0dc60cd3a29a886a645ac4cf9bbdfd1e7a5d75f134b46ff58d7429f9a961fc50
 MISC metadata.xml 290 RMD160 812d033907b7a0d755e1e38fb368b8eb5384cf02 SHA1 e7fc920fb3801d39c18f549ebac50add4d7f60da SHA256 307cd1defa0ca02a2c515b20c8ce50c80c4deccf845b8c55badd51896cbd8771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2j8mUACgkQgAnW8HDreRbOeACfdRiQATLJzWs75l51ALc1a815
-E+QAniwResuidorx2pKYa7XE9gXPwH4P
-=0nsS
+iEYEARECAAYFAk2v0O0ACgkQgAnW8HDreRbGfQCfdO+Uc7FaSeJCD8MOHgibrlHN
+xy0AoNFZXgUz1mHltI7bH6Fj5gP0rUbw
+=MByV
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libcmatrix/files/3.2.1-atlas.patch b/sci-libs/libcmatrix/files/3.2.1-atlas.patch
new file mode 100644
index 000000000000..b10b41d4e389
--- /dev/null
+++ b/sci-libs/libcmatrix/files/3.2.1-atlas.patch
@@ -0,0 +1,33 @@
+ configure-libraries.ac |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure-libraries.ac b/configure-libraries.ac
+index a64e79c..afc75b8 100755
+--- a/configure-libraries.ac
++++ b/configure-libraries.ac
+@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas,
+ 	AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check)
+ if test x$with_atlas != xno; then
+ 	FOUNDATLAS=yes
++	PKG_CHECK_MODULES([ATLAS], [cblas])
+ 	AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no
+ 		AC_MSG_WARN([ATLAS header files (cblas.h) not found 
+ Is CPPFLAGS is defined to include relevant directory?]))
+@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?]))
+ 		AC_MSG_WARN([ATLAS library (libatlas.a) not found
+ Is LDFLAGS is defined to include relevant directory?]))
+ 	if test x$FOUNDATLAS = xyes; then	
+-		LIBS="-lcblas $LIBS"
++		LIBS="$ATLAS_LIBS $LIBS"
+ 		CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL"
+ 	else
+ 		if test x$with_atlas = xyes; then
+@@ -49,6 +50,8 @@ Is LDFLAGS is defined to include relevant directory?]))
+ 	fi	
+ fi
+ 
++AC_SUBST(ATLAS_LIBS)
++
+ AC_ARG_WITH(acml,
+ 	AS_HELP_STRING([--with-acml],[use the ACML BLAS library (default=no)]),,with_acml=no)
+ if test x$with_acml = xyes; then
diff --git a/sci-libs/libcmatrix/files/3.2.1-shared.patch b/sci-libs/libcmatrix/files/3.2.1-shared.patch
index 9ab453d98b17..4e843027abde 100644
--- a/sci-libs/libcmatrix/files/3.2.1-shared.patch
+++ b/sci-libs/libcmatrix/files/3.2.1-shared.patch
@@ -46,22 +46,22 @@ index 1361371..1448e76 100755
 -	chmod a+rx $@
 -	$(RANLIB) $@
 +lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) @ATLAS_LIBS@
 +	ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3
 +	ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so
 +
 +lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) @ATLAS_LIBS@
 +	ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3
 +	ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so
 +
 +lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) @ATLAS_LIBS@
 +	ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3
 +	ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so
 +
 +lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) @ATLAS_LIBS@
 +	ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3
 +	ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so
  
diff --git a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild b/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild
index c19e33d7963f..d9179d6a003e 100644
--- a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild
+++ b/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild,v 1.3 2011/04/12 06:34:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild,v 1.4 2011/04/21 06:38:32 jlec Exp $
 
 EAPI="3"
 
@@ -30,7 +30,8 @@ src_prepare() {
 		"${FILESDIR}"/${PV}-shared.patch \
 		"${FILESDIR}"/${PV}-minuit2.patch \
 		"${FILESDIR}"/${PV}-gcc4.4.patch \
-		"${FILESDIR}"/${PV}-gcc4.6.patch
+		"${FILESDIR}"/${PV}-gcc4.6.patch \
+		"${FILESDIR}"/${PV}-atlas.patch
 	eautoreconf
 }