Fixed missing components (bug #399029, thanks Francois Bissey), removed useless seds and fixed optional sed's

(Portage version: 2.1.10.41/cvs/Linux x86_64)

1 files changed, 29 insertions, 26 deletions

diff --git a/dev-python/cvxopt/files/cvxopt-setup.patch b/dev-python/cvxopt/files/cvxopt-setup.patch
index a628cdae9a3a..fcef6e40bfa1 100644
--- a/dev-python/cvxopt/files/cvxopt-setup.patch
+++ b/dev-python/cvxopt/files/cvxopt-setup.patch
@@ -1,6 +1,6 @@
---- setup.py.orig	2012-01-06 04:59:53.000000000 +0000
-+++ setup.py	2012-01-06 06:21:48.000000000 +0000
-@@ -2,58 +2,58 @@
+--- 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
@@ -13,33 +13,30 @@
  
  # Directory containing libgsl (used only when BUILD_GSL = 1).
 -GSL_LIB_DIR = '/usr/lib'       
-+GSL_LIB_DIR = ''       
- 
- # Directory containing the GSL header files (used only when BUILD_GSL = 1).
+-
+-# Directory containing the GSL header files (used only when BUILD_GSL = 1).
 -GSL_INC_DIR = '/usr/include/gsl'  
-+GSL_INC_DIR = ''  
++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'       
-+FFTW_LIB_DIR = ''       
- 
- # Directory containing fftw.h (used only when BUILD_FFTW = 1).
+-
+-# Directory containing fftw.h (used only when BUILD_FFTW = 1).
 -FFTW_INC_DIR = '/usr/include'  
-+FFTW_INC_DIR = ''  
++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'       
-+GLPK_LIB_DIR = ''       
- 
- # Directory containing glpk.h (used only when BUILD_GLPK = 1).
+-
+-# Directory containing glpk.h (used only when BUILD_GLPK = 1).
 -GLPK_INC_DIR = '/usr/include'  
-+GLPK_INC_DIR = ''  
++GLPK_LIB_DIR = ''       
  
  # Set to 1 if you are installing the DSDP module.
  BUILD_DSDP = 0
@@ -48,38 +45,44 @@
 -DSDP_LIB_DIR = '/usr/lib'
 +DSDP_LIB_DIR = ''
   
- # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+-# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
 -DSDP_INC_DIR = '/usr/include'
-+DSDP_INC_DIR = ''
- 
+-
  extmods = []
  
  # optional modules
  
  if BUILD_GSL:
 -    gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
+-        include_dirs = [ GSL_INC_DIR ],
 +    gsl = Extension('gsl', libraries = ['gsl'],
-         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'],
+-        include_dirs = [ FFTW_INC_DIR ],
 +    fftw = Extension('fftw', libraries = ['fftw3'],
-         include_dirs = [ FFTW_INC_DIR ],
          library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
          sources = ['C/fftw.c'] )
-@@ -67,7 +67,7 @@
+     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'],
-         include_dirs = [ DSDP_INC_DIR ],
          library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
          sources = ['C/dsdp.c'] )
-@@ -85,7 +85,7 @@
+     extmods += [dsdp];
+@@ -85,7 +69,7 @@
  else:    
      MACROS = []
  
@@ -88,7 +91,7 @@
      library_dirs = [ ATLAS_LIB_DIR ],
      define_macros = MACROS,
      sources = ['C/base.c','C/dense.c','C/sparse.c']) 
-@@ -95,22 +95,16 @@
+@@ -95,22 +79,16 @@
      define_macros = MACROS,
      sources = ['C/blas.c'] )
  
@@ -114,7 +117,7 @@
  
  # Build for int or long? 
  import sys
-@@ -118,28 +112,16 @@
+@@ -118,28 +96,16 @@
  
  cholmod = Extension('cholmod',
      library_dirs = [ ATLAS_LIB_DIR ],
@@ -122,7 +125,7 @@
 -    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
 -        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
 -        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
-+    libraries = ['cholmod' ],
++    libraries = ['cholmod','blas'],
      define_macros = MACROS + [('NPARTITION', '1')],
 -    sources = [ 'C/cholmod.c' ] + 
 -        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',