fixed typo. removed old

(Portage version: 2.1.10.60/cvs/Linux x86_64)

4 files changed, 14 insertions, 160 deletions

diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 2cf6d5792ccb..bc2bd0ba41ed 100644
--- a/dev-python/cvxopt/ChangeLog
+++ b/dev-python/cvxopt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/cvxopt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/ChangeLog,v 1.9 2012/05/24 15:33:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/ChangeLog,v 1.10 2012/05/26 14:56:34 bicatali Exp $
+
+*cvxopt-1.1.5-r1 (26 May 2012)
+
+  26 May 2012; Sébastien Fabbro <bicatali@gentoo.org> -cvxopt-1.1.4-r1.ebuild,
+  +cvxopt-1.1.5-r1.ebuild, files/cvxopt-1.1.5-setup.patch,
+  -files/cvxopt-setup.patch:
+  fixed typo. removed old
 
   24 May 2012; Sébastien Fabbro <bicatali@gentoo.org>
   files/cvxopt-1.1.5-setup.patch:
diff --git a/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild b/dev-python/cvxopt/cvxopt-1.1.5-r1.ebuild
index 595c66514d73..3e2080279959 100644
--- a/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.4 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5-r1.ebuild,v 1.1 2012/05/26 14:56:34 bicatali Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P}/src"
 
 src_prepare(){
-	epatch "${FILESDIR}"/${PN}-setup.patch
+	epatch "${FILESDIR}"/${P}-setup.patch
 	rm -rf src/C/SuiteSparse*/
 	rm -rf ../doc/build # 413905
 
@@ -44,7 +44,7 @@ src_prepare(){
 			-e "s/ -l/\',\'/g" \
 			-e 's/.,.pthread//g' \
 			-e "s:  ::")\'
-		sed -i -e "s:\(libraries.*\)'${1}'\(.*\):\1${pylib}\2:g" setup.py
+		sed -i -e "/_LIB = /s:\(.*\)'${1}'\(.*\):\1${pylib}\2:" setup.py
 	}
 
 	use_cvx() {
@@ -57,8 +57,8 @@ src_prepare(){
 
 	pkg_lib blas
 	pkg_lib lapack
-	use_cvx gsl && pkg_lib gsl
-	use_cvx fftw && pkg_lib fftw3
+	use_cvx gsl
+	use_cvx fftw
 	use_cvx glpk
 	use_cvx dsdp
 	distutils_src_prepare
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.5-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.5-setup.patch
index 53237d5496bd..f91ae9f62ff4 100644
--- a/dev-python/cvxopt/files/cvxopt-1.1.5-setup.patch
+++ b/dev-python/cvxopt/files/cvxopt-1.1.5-setup.patch
@@ -150,7 +150,7 @@
 -        glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
 -        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
 -        glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+     libraries = ['cholmod'] + BLAS_LIBS,
++     libraries = ['cholmod'] + BLAS_LIB,
 +     define_macros = MACROS + [('NPARTITION', '1')],
 +     sources = [ 'C/cholmod.c' ])
 +
diff --git a/dev-python/cvxopt/files/cvxopt-setup.patch b/dev-python/cvxopt/files/cvxopt-setup.patch
deleted file mode 100644
index fcef6e40bfa1..000000000000
--- a/dev-python/cvxopt/files/cvxopt-setup.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- setup.py.orig	2011-12-22 10:53:49.000000000 +1300
-+++ setup.py	2012-01-16 11:17:04.207596266 +1300
-@@ -2,73 +2,57 @@
- from glob import glob
- 
- # directory containing libblas and liblapack
--ATLAS_LIB_DIR = '/usr/lib'
-+ATLAS_LIB_DIR = ''
- 
- # Set to 1 if you are using the random number generators in the GNU
- # Scientific Library.
- BUILD_GSL = 0
- 
- # Directory containing libgsl (used only when BUILD_GSL = 1).
--GSL_LIB_DIR = '/usr/lib'       
--
--# Directory containing the GSL header files (used only when BUILD_GSL = 1).
--GSL_INC_DIR = '/usr/include/gsl'  
-+GSL_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the fftw module.
- BUILD_FFTW = 0
- 
- # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
--FFTW_LIB_DIR = '/usr/lib'       
--
--# Directory containing fftw.h (used only when BUILD_FFTW = 1).
--FFTW_INC_DIR = '/usr/include'  
-+FFTW_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the glpk module.
- BUILD_GLPK = 0
- 
- # Directory containing libglpk (used only when BUILD_GLPK = 1).
--GLPK_LIB_DIR = '/usr/lib'       
--
--# Directory containing glpk.h (used only when BUILD_GLPK = 1).
--GLPK_INC_DIR = '/usr/include'  
-+GLPK_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the DSDP module.
- BUILD_DSDP = 0
- 
- # Directory containing libdsdp (used only when BUILD_DSDP = 1).
--DSDP_LIB_DIR = '/usr/lib'
-+DSDP_LIB_DIR = ''
-  
--# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
--DSDP_INC_DIR = '/usr/include'
--
- extmods = []
- 
- # optional modules
- 
- if BUILD_GSL:
--    gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
--        include_dirs = [ GSL_INC_DIR ],
-+    gsl = Extension('gsl', libraries = ['gsl'],
-         library_dirs = [ GSL_LIB_DIR ],
-         sources = ['C/gsl.c'] )
-     extmods += [gsl];
- 
- if BUILD_FFTW:
--    fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
--        include_dirs = [ FFTW_INC_DIR ],
-+    fftw = Extension('fftw', libraries = ['fftw3'],
-         library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
-         sources = ['C/fftw.c'] )
-     extmods += [fftw];
- 
- if BUILD_GLPK:
-     glpk = Extension('glpk', libraries = ['glpk'],
--        include_dirs = [ GLPK_INC_DIR ],
-         library_dirs = [ GLPK_LIB_DIR ],
-         sources = ['C/glpk.c'] )
-     extmods += [glpk];
- 
- if BUILD_DSDP:
--    dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
--        include_dirs = [ DSDP_INC_DIR ],
-+    dsdp = Extension('dsdp', libraries = ['dsdp'],
-         library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
-         sources = ['C/dsdp.c'] )
-     extmods += [dsdp];
-@@ -85,7 +69,7 @@
- else:    
-     MACROS = []
- 
--base = Extension('base', libraries = ['m','lapack','blas'],
-+base = Extension('base', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/base.c','C/dense.c','C/sparse.c']) 
-@@ -95,22 +79,16 @@
-     define_macros = MACROS,
-     sources = ['C/blas.c'] )
- 
--lapack = Extension('lapack', libraries = ['lapack','blas'],
-+lapack = Extension('lapack', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/lapack.c'] )
- 
- umfpack = Extension('umfpack', 
--    include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
--        'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source', 
--        'C/SuiteSparse/UFconfig' ],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
--    libraries = [ 'blas', 'lapack'],
--    sources = [ 'C/umfpack.c',
--        'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
--        'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
--        glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
-+    libraries = [ 'umfpack' ],
-+    sources = [ 'C/umfpack.c' ])
- 
- # Build for int or long? 
- import sys
-@@ -118,28 +96,16 @@
- 
- cholmod = Extension('cholmod',
-     library_dirs = [ ATLAS_LIB_DIR ],
--    libraries = ['lapack', 'blas'],
--    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
--        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
--        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
-+    libraries = ['cholmod','blas'],
-     define_macros = MACROS + [('NPARTITION', '1')],
--    sources = [ 'C/cholmod.c' ] + 
--        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
--            'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
--        ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
--            'colamd_global.c']] +
--        glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
--        glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
--        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
--        glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+    sources = [ 'C/cholmod.c' ])
- 
- amd = Extension('amd', 
--    include_dirs = [ 'C/SuiteSparse/AMD/Include', 
--        'C/SuiteSparse/UFconfig' ],
-     define_macros = MACROS,
--    sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
-+    libraries = [ 'amd' ],
-+    sources = [ 'C/amd.c' ])
- 
--misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
-+misc_solvers = Extension('misc_solvers', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/misc_solvers.c'] )