Make cvxopt use pkg-config to set BLAS/LAPACK, add glpk useflag description in metadata.

(Portage version: 2.2.0_alpha41/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 112 insertions, 20 deletions

diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 21370e049..b7d532103 100644
--- a/dev-python/cvxopt/ChangeLog
+++ b/dev-python/cvxopt/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+  cvxopt-1.1.3.ebuild, +files/cvxopt-1.1.3-blas.patch, metadata.xml:
+  Add useflag description in metadata
+
+  20 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+  cvxopt-1.1.3.ebuild, +files/cvxopt-1.1.3-blas.patch:
+  Make cvxopt use pkg-config for BLAS/LAPACK
+
   03 May 2011; Justin Lecher <jlec@gentoo.org> cvxopt-1.1.3.ebuild:
   Smaller reorganization of the ebuild
 
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index a931b4c5b..a8bf90b3e 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX cvxopt-1.1.3-blas.patch 2833 RMD160 5c247a60c42a2b0507eed17410f7f9cff9b79464 SHA1 628b178c5f617217fcdac2f0e3f49cb5ab5a652b SHA256 4794ef677e984bcd564f7c426bdaa6361aa2bfe3cce83bbd1a88647551bca698
 DIST cvxopt-1.1.3.tar.gz 2927536 RMD160 cd0fdf51db957b388803b305f43ff323415b2252 SHA1 fe048bd21bb33eb99adb2759eda6f06d7520aa31 SHA256 c9563f04a31516e7b042d9e25344ae24bf6bc3e905c53ed077f9974c0efd9a7a
-EBUILD cvxopt-1.1.3.ebuild 988 RMD160 e9df1b914aafaecd26b2adc31a44809d9332a263 SHA1 46e8ee5f96758f617ddb49554a2d571dcd548751 SHA256 e4bf5ddae25eb74d6c52b12d94544ee88af8e69daab3aec59adba25d4dc3d4b6
-MISC ChangeLog 416 RMD160 346711378b73c764ead2af3e1fad3bc34082138f SHA1 ee21b8f97824ece336d3a68e9d9bbe7fee9d00a1 SHA256 ec73bd52a0eebeeacf03e198d80da24245ea08a934e64c837afee98cfa63acd3
-MISC metadata.xml 700 RMD160 0f7133c6997bcc9f6628892cd14df58396b2e964 SHA1 eaff2b19a0158437ebfa252de4b0dddc9cbe38ca SHA256 964ca6fb3e432ca9769b37fd063ce2268749334db92bde64fb4ea373790a6a50
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3H13YACgkQgAnW8HDreRZXegCeNfdmESZDT6m88P/q+v3wN3QJ
-nLcAmgJy+l70/ylpiw+4EbSsxAkfRevr
-=k38k
------END PGP SIGNATURE-----
+EBUILD cvxopt-1.1.3.ebuild 1398 RMD160 8003ffb22f5fa4ed7d5d40245becd1f97c70376a SHA1 7e983e36c53367aca951211e4902453273fb5fd0 SHA256 49bf76ba408818cf42355cf9aba8b989590b91af220217827850b55258afc730
+MISC ChangeLog 759 RMD160 b6a43673d46ff26f69c7a6b26b1a236dcc636b07 SHA1 20acf312b6396721fac6d4bf61438bee0a1e4f8d SHA256 1c156badea441bd28370a980ab5d3635dc5deddaaa0000cb9cc42531c855ee75
+MISC metadata.xml 773 RMD160 0896f77a40bd838a9543fae42d240d7e47fbdaf2 SHA1 5ca51919cac1aabbaafe560fc4689fa83202ae1b SHA256 6e7d1cf0e53dcfb136d3cdc183671ecf3d9fb121eb6e28651e48325dc2b4c40c
diff --git a/dev-python/cvxopt/cvxopt-1.1.3.ebuild b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
index 93571221b..cfdfbba29 100644
--- a/dev-python/cvxopt/cvxopt-1.1.3.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
@@ -3,13 +3,12 @@
 # $Header: $
 
 EAPI=3
-
 PYTHON_DEPEND=2:2.5
 SUPPORT_PYTHON_ABIS=1
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
 
-inherit distutils
+inherit eutils distutils python
 
 DESCRIPTION="A Python Package for Convex Optimization"
 HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
@@ -22,20 +21,35 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="fftw glpk gsl"
 
-DEPEND="
-	virtual/blas
-	virtual/cblas
+DEPEND="virtual/blas
 	virtual/lapack
-
+	virtual/cblas
 	fftw? ( sci-libs/fftw )
 	glpk? ( sci-mathematics/glpk )
 	gsl? ( sci-libs/gsl )"
-
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}/src
 
 src_prepare(){
+	epatch "${FILESDIR}/${PN}"-1.1.3-blas.patch
+
+	BLAS=\'$(pkg-config --libs-only-l blas | sed \
+		-e 's/^-l//' \
+		-e "s/ -l/\',\'/g" \
+		-e 's/,.pthread//g' \
+		-e "s:  ::")\'
+	LAPACK=\'$(pkg-config --libs-only-l lapack | sed \
+		-e 's/^-l//' \
+		-e "s/ -l/\',\'/g" \
+		-e 's/,.pthread//g' \
+		-e "s:  ::")\'
+
+	sed -i \
+		-e "s:@GENTOO_BLAS:${BLAS}:" \
+		-e "s:@GENTOO_LAPACK:${LAPACK}:" \
+		setup.py
+
 	distutils_src_prepare
 
 	prepare_builddir() {
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch b/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch
new file mode 100644
index 000000000..12c434990
--- /dev/null
+++ b/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch
@@ -0,0 +1,76 @@
+--- setup.py.orig	2011-06-20 15:32:19.584436452 +1200
++++ setup.py	2011-06-20 15:35:14.962030823 +1200
+@@ -46,14 +48,14 @@
+ # optional modules
+ 
+ if BUILD_GSL:
+-    gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
++    gsl = Extension('gsl', libraries = ['m', 'gsl', @GENTOO_BLAS],
+         include_dirs = [ GSL_INC_DIR ],
+         library_dirs = [ GSL_LIB_DIR ],
+         sources = ['C/gsl.c'] )
+     extmods += [gsl];
+ 
+ if BUILD_FFTW:
+-    fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
++    fftw = Extension('fftw', libraries = ['fftw3', @GENTOO_BLAS],
+         include_dirs = [ FFTW_INC_DIR ],
+         library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
+         sources = ['C/fftw.c'] )
+@@ -67,7 +69,7 @@
+     extmods += [glpk];
+ 
+ if BUILD_DSDP:
+-    dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
++    dsdp = Extension('dsdp', libraries = ['dsdp', @GENTOO_LAPACK],
+         include_dirs = [ DSDP_INC_DIR ],
+         library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
+         sources = ['C/dsdp.c'] )
+@@ -85,17 +87,17 @@
+ else:    
+     MACROS = []
+ 
+-base = Extension('base', libraries = ['m','lapack','blas'],
++base = Extension('base', libraries = ['m', @GENTOO_LAPACK],
+     library_dirs = [ ATLAS_LIB_DIR ],
+     define_macros = MACROS,
+     sources = ['C/base.c','C/dense.c','C/sparse.c']) 
+ 
+-blas = Extension('blas', libraries = ['blas'],
++blas = Extension('blas', libraries = [@GENTOO_BLAS],
+     library_dirs = [ ATLAS_LIB_DIR ],
+     define_macros = MACROS,
+     sources = ['C/blas.c'] )
+ 
+-lapack = Extension('lapack', libraries = ['lapack','blas'],
++lapack = Extension('lapack', libraries = [@GENTOO_LAPACK],
+     library_dirs = [ ATLAS_LIB_DIR ],
+     define_macros = MACROS,
+     sources = ['C/lapack.c'] )
+@@ -106,7 +108,7 @@
+         'C/SuiteSparse/UFconfig' ],
+     library_dirs = [ ATLAS_LIB_DIR ],
+     define_macros = MACROS,
+-    libraries = [ 'blas', 'lapack'],
++    libraries = [@GENTOO_LAPACK],
+     sources = [ 'C/umfpack.c',
+         'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
+         'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
+@@ -118,7 +120,7 @@
+ 
+ cholmod = Extension('cholmod',
+     library_dirs = [ ATLAS_LIB_DIR ],
+-    libraries = ['lapack', 'blas'],
++    libraries = [@GENTOO_LAPACK],
+     include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
+         'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
+         'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
+@@ -139,7 +141,7 @@
+     define_macros = MACROS,
+     sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
+ 
+-misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
++misc_solvers = Extension('misc_solvers', libraries = [@GENTOO_LAPACK],
+     library_dirs = [ ATLAS_LIB_DIR ],
+     define_macros = MACROS,
+     sources = ['C/misc_solvers.c'] )
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 3bd706c66..9381d9019 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -5,5 +5,8 @@
 <longdescription lang="en">
 CVXOPT is a free software package for convex optimization based on the Python programming language. It can be used with the interactive Python interpreter, on the command line by executing Python scripts, or integrated in other software via Python extension modules. Its main purpose is to make the development of software for convex optimization applications straightforward by building on Python's extensive standard library and on the strengths of Python as a high-level programming language.
 </longdescription>
+	<use>
+		<flag name='glpk'>Use GNU Linear Programming Kit</flag>
+	</use>
 </pkgmetadata>