* [gentoo-commits] proj/sci:master commit in: dev-python/cvxopt/files/, dev-python/cvxopt/
@ 2011-06-20 23:59 Francois Bissey
0 siblings, 0 replies; 2+ messages in thread
From: Francois Bissey @ 2011-06-20 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 582674c677fddf4fffab2176fd24e798d41c5707
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Mon Jun 20 23:59:17 2011 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Mon Jun 20 23:59:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=582674c6
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)
---
dev-python/cvxopt/ChangeLog | 8 +++
dev-python/cvxopt/cvxopt-1.1.3.ebuild | 28 ++++++--
dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch | 76 +++++++++++++++++++++++
dev-python/cvxopt/metadata.xml | 3 +
4 files changed, 108 insertions(+), 7 deletions(-)
diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 21370e0..b7d5321 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/cvxopt-1.1.3.ebuild b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
index 9357122..cfdfbba 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 0000000..12c4349
--- /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 3bd706c..9381d90 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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/cvxopt/files/, dev-python/cvxopt/
@ 2012-01-07 23:56 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2012-01-07 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 137a2c517bd37a318902657b3faa36a31cd5f3b6
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Sat Jan 7 23:56:01 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 23:56:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=137a2c51
now in main tree
---
dev-python/cvxopt/ChangeLog | 22 -------
dev-python/cvxopt/cvxopt-1.1.3.ebuild | 67 --------------------
dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch | 76 -----------------------
dev-python/cvxopt/metadata.xml | 12 ----
4 files changed, 0 insertions(+), 177 deletions(-)
diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
deleted file mode 100644
index 2d4bb92..0000000
--- a/dev-python/cvxopt/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-# ChangeLog for dev-python/cvxopt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 24 Jun 2011; Justin Lecher <jlec@gentoo.org> cvxopt-1.1.3.ebuild:
- Sort inherit and/or USE
-
- 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
-
- 29 Dec 2010; François Bissey <f.r.bissey@massey.ac.nz> cvxopt-1.1.3.ebuild:
- Add a changelog :), synchronize with the version in sage-on-gentoo overlay
- and discussions on bug #230457
-
diff --git a/dev-python/cvxopt/cvxopt-1.1.3.ebuild b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
deleted file mode 100644
index 3539f07..0000000
--- a/dev-python/cvxopt/cvxopt-1.1.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $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 eutils python
-
-DESCRIPTION="A Python Package for Convex Optimization"
-HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
-SRC_URI="http://abel.ee.ucla.edu/${PN}/${P}.tar.gz"
-
-RESTRICT="mirror"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fftw glpk gsl"
-
-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() {
- set_flag() {
- if use ${1}; then
- sed -i -e "s/\(BUILD_${2} =\) 0/\1 1/" setup.py || die
- fi
- }
-
- set_flag gsl GSL
- set_flag fftw FFTW
- set_flag glpk GLPK
- }
- python_execute_function -s 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
deleted file mode 100644
index 12c4349..0000000
--- a/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- 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
deleted file mode 100644
index 9381d90..0000000
--- a/dev-python/cvxopt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<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>
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-07 23:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-20 23:59 [gentoo-commits] proj/sci:master commit in: dev-python/cvxopt/files/, dev-python/cvxopt/ Francois Bissey
-- strict thread matches above, loose matches on Subject: below --
2012-01-07 23:56 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox