sci-libs/scalapack: Use latest pkg-config, removed old

Package-Manager: portage-2.2.01.21418-prefix

4 files changed, 8 insertions, 186 deletions

diff --git a/sci-libs/scalapack/ChangeLog b/sci-libs/scalapack/ChangeLog
index 3d42fb5e3..753eafabe 100644
--- a/sci-libs/scalapack/ChangeLog
+++ b/sci-libs/scalapack/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/scalapack-2.0.1-link.patch, -files/scalapack-2.0.1-multipledefs.patch,
+  scalapack-2.0.2.ebuild:
+  sci-libs/scalapack: Use latest pkg-config, removed old
+
   12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> -scalapack-1.8.0.ebuild,
   -scalapack-2.0.1.ebuild, metadata.xml, scalapack-2.0.2.ebuild:
   sci-libs/scalapack: dependencies fix, removed old
diff --git a/sci-libs/scalapack/files/scalapack-2.0.1-link.patch b/sci-libs/scalapack/files/scalapack-2.0.1-link.patch
deleted file mode 100644
index cd528a1d5..000000000
--- a/sci-libs/scalapack/files/scalapack-2.0.1-link.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- scalapack-2.0.1.orig/CMakeLists.txt	2012-01-17 23:35:02.000000000 +0000
-+++ scalapack-2.0.1/CMakeLists.txt	2012-02-23 05:27:30.772365248 +0000
-@@ -232,12 +232,15 @@
- 
- if (UNIX)
-    add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C})
-+   target_link_libraries(scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-    scalapack_install_library(scalapack)
- else (UNIX) # Need to separate Fortran and C Code
-    OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
-    add_library(scalapack ${blacs} ${tools-C} ${pblas} ${ptools} ${redist} ${src-C})
-    add_library(scalapack-F ${pblas-F} ${pbblas} ${ptzblas} ${tools} ${src} ${extra_lapack} )
-+   target_link_libraries(scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-    scalapack_install_library(scalapack)
-+   target_link_libraries(scalapack-F ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-    scalapack_install_library(scalapack-F)
- endif (UNIX)
- add_subdirectory(TESTING)
diff --git a/sci-libs/scalapack/files/scalapack-2.0.1-multipledefs.patch b/sci-libs/scalapack/files/scalapack-2.0.1-multipledefs.patch
deleted file mode 100644
index 2495ec97d..000000000
--- a/sci-libs/scalapack/files/scalapack-2.0.1-multipledefs.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Nur scalapack-2.0.1.orig/SRC/pblas.h scalapack-2.0.1/SRC/pblas.h
---- scalapack-2.0.1.orig/SRC/pblas.h	2007-04-03 01:06:06.000000000 +0100
-+++ scalapack-2.0.1/SRC/pblas.h	2012-02-23 05:13:01.959529911 +0000
-@@ -543,6 +543,7 @@
- #define pscasum_          PSCASUM
- #define pcamax_           PCAMAX
- #define pcrot_            PCROT
-+#define crot_             CROT
- 
- #define pzswap_           PZSWAP
- #define pzscal_           PZSCAL
-@@ -555,6 +556,7 @@
- #define pdzasum_          PDZASUM
- #define pzamax_           PZAMAX
- #define pzrot_            PZROT
-+#define zrot_             ZROT
-                                                     /* Level-2 PBLAS */
- #define pcgemv_           PCGEMV
- #define pcgeru_           PCGERU
-diff -Nur scalapack-2.0.1.orig/SRC/pdsyevr.f scalapack-2.0.1/SRC/pdsyevr.f
---- scalapack-2.0.1.orig/SRC/pdsyevr.f	2011-11-11 03:10:38.000000000 +0000
-+++ scalapack-2.0.1/SRC/pdsyevr.f	2012-02-23 05:13:02.149534905 +0000
-@@ -675,7 +675,7 @@
- *
- *     Each processor computes the work assignments for all processors
- *
--      CALL CMPIM2( IIL, IIU, NPROCS,
-+      CALL DMPIM2( IIL, IIU, NPROCS,
-      $             IWORK(INDILU), IWORK(INDILU+NPROCS) )
- *
- *     Find local work assignment
-@@ -863,7 +863,7 @@
- *
- *           Find collaborators of MYPROC            
-             IF( (NPROCS.GT.1).AND.(MYIL.GT.0) ) THEN
--               CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+               CALL DMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-             ELSE
-@@ -949,7 +949,7 @@
-             IINDWLC = INDWORK + INDWLC - 1
-             IF(.NOT.FINISH) THEN
-                IF((NEEDIL.LT.DOL).OR.(NEEDIU.GT.DOU)) THEN
--                  CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-+                  CALL DMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-      $                 IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-                ELSE
-@@ -1172,7 +1172,7 @@
- *     
- *
- ***********************************************************************
--      SUBROUTINE CMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
-+      SUBROUTINE DMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
- 
-       IMPLICIT NONE
- 
-@@ -1234,7 +1234,7 @@
-       END
- 
- 
--      SUBROUTINE CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+      SUBROUTINE DMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   PMYILS, PMYIUS,
-      $                   COLBRT, FRSTCL, LASTCL )
- 
-diff -Nur scalapack-2.0.1.orig/SRC/pssyevr.f scalapack-2.0.1/SRC/pssyevr.f
---- scalapack-2.0.1.orig/SRC/pssyevr.f	2011-11-11 03:10:38.000000000 +0000
-+++ scalapack-2.0.1/SRC/pssyevr.f	2012-02-23 05:13:02.349540161 +0000
-@@ -675,7 +675,7 @@
- *
- *     Each processor computes the work assignments for all processors
- *
--      CALL CMPIM2( IIL, IIU, NPROCS,
-+      CALL SMPIM2( IIL, IIU, NPROCS,
-      $             IWORK(INDILU), IWORK(INDILU+NPROCS) )
- *
- *     Find local work assignment
-@@ -863,7 +863,7 @@
- *
- *           Find collaborators of MYPROC            
-             IF( (NPROCS.GT.1).AND.(MYIL.GT.0) ) THEN
--               CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+               CALL SMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-             ELSE
-@@ -949,7 +949,7 @@
-             IINDWLC = INDWORK + INDWLC - 1
-             IF(.NOT.FINISH) THEN
-                IF((NEEDIL.LT.DOL).OR.(NEEDIU.GT.DOU)) THEN
--                  CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-+                  CALL SMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-      $                 IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-                ELSE
-@@ -1172,7 +1172,7 @@
- *     
- *
- ***********************************************************************
--      SUBROUTINE CMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
-+      SUBROUTINE SMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
- 
-       IMPLICIT NONE
- 
-@@ -1234,7 +1234,7 @@
-       END
- 
- 
--      SUBROUTINE CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+      SUBROUTINE SMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   PMYILS, PMYIUS,
-      $                   COLBRT, FRSTCL, LASTCL )
- 
-diff -Nur scalapack-2.0.1.orig/SRC/pzheevr.f scalapack-2.0.1/SRC/pzheevr.f
---- scalapack-2.0.1.orig/SRC/pzheevr.f	2011-11-11 03:10:38.000000000 +0000
-+++ scalapack-2.0.1/SRC/pzheevr.f	2012-02-23 05:13:01.899528334 +0000
-@@ -727,7 +727,7 @@
- *
- *     Each processor computes the work assignments for all processors
- *
--      CALL CMPIM2( IIL, IIU, NPROCS,
-+      CALL ZMPIM2( IIL, IIU, NPROCS,
-      $             IWORK(INDILU), IWORK(INDILU+NPROCS) )
- *
- *     Find local work assignment
-@@ -914,7 +914,7 @@
- 
- *           Find collaborators of MYPROC            
-             IF( (NPROCS.GT.1).AND.(MYIL.GT.0) ) THEN
--               CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+               CALL ZMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-             ELSE
-@@ -999,7 +999,7 @@
-             IINDWLC = INDRWORK + INDWLC - 1
-             IF(.NOT.FINISH) THEN
-                IF((NEEDIL.LT.DOL).OR.(NEEDIU.GT.DOU)) THEN
--                  CALL CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-+                  CALL ZMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU,
-      $                 IWORK(INDILU), IWORK(INDILU+NPROCS),
-      $                   COLBRT, FRSTCL, LASTCL )
-                ELSE
-@@ -1223,7 +1223,7 @@
- *
- ***********************************************************************
- 
--      SUBROUTINE CMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
-+      SUBROUTINE ZMPIM2( IL, IU, NPROCS, PMYILS, PMYIUS )
- 
-       IMPLICIT NONE
- 
-@@ -1288,7 +1288,7 @@
- *
- *
- ***********************************************************************
--      SUBROUTINE CMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-+      SUBROUTINE ZMPCOL( MYPROC, NPROCS, IIL, NEEDIL, NEEDIU, 
-      $                   PMYILS, PMYIUS,
-      $                   COLBRT, FRSTCL, LASTCL )
- 
diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild b/sci-libs/scalapack/scalapack-2.0.2.ebuild
index ca9c90fe7..19778f653 100644
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2.ebuild
@@ -12,19 +12,17 @@ SRC_URI="${HOMEPAGE}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 RDEPEND="
 	virtual/lapack
 	virtual/mpi
 	!sci-libs/mpiblacs"
-
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-2.0.1-link.patch
 	# gentoo fix to avoid collision with other scalapack
 	sed -i \
 		-e 's:BINARY_DIR}/scalapack.pc:BINARY_DIR}/refscalapack.pc:g' \
@@ -38,8 +36,8 @@ src_configure() {
 	scalapack_configure() {
 		local mycmakeargs=(
 			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
-			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
-			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
 			$(cmake-utils_use_build test TESTING)
 			$@
 		)