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

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 45 insertions, 36 deletions

diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 1953045043bd..051a4fc571d0 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.2 2012/01/16 20:35:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/ChangeLog,v 1.3 2012/01/17 18:28:45 bicatali Exp $
+
+*cvxopt-1.1.4-r1 (17 Jan 2012)
+
+  17 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> -cvxopt-1.1.4.ebuild,
+  +cvxopt-1.1.4-r1.ebuild, files/cvxopt-setup.patch:
+  Fixed missing components (bug #399029, thanks Francois Bissey), removed
+  useless seds and fixed optional sed's
 
   16 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> cvxopt-1.1.4.ebuild:
   Fixed doc generation, bug #398857 thanks Martin von Gagern
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 4ce97e2c6db9..42e21708b153 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cvxopt-setup.patch 5067 RMD160 61346ab8ffc3f510f9a2197b4b7db05b66a712d1 SHA1 e7d1cf7dd227ffc75d31e37a83012c6fb13c1d2a SHA256 b48c06fc215205901a6b784be37b5a26e8cea1751a8a2c9c39f5fbf825adb9a0
+AUX cvxopt-setup.patch 5209 RMD160 63c25b9fd98f77046ea65af5258bb690a3ba3484 SHA1 da7f08da3d453778d4571c22f4eede8734d8b2c1 SHA256 c5a6f39b73779ac3d7082a564b51f7ffbeedc0f68844bc609720240cf98cff74
 DIST cvxopt-1.1.4.tar.gz 2949975 RMD160 7e5ed85b27fd6298cd2919c7b914669baea3df98 SHA1 ee063b8d127a2e744f663ef1a9a37e1acdc55970 SHA256 1ac01ae510038f23751624301ec8d67bfda18a8a444b4f516c52d885a3c41792
-EBUILD cvxopt-1.1.4.ebuild 1897 RMD160 40fd44dee6015f5149a23d4dc346b2fcf42abccf SHA1 120ac42e53152fe86db319689e0996adcc399fff SHA256 ca3762732e5fe30e0fba9e1cb4e7ae0feae8470a00ac50298e81a6ed7006a8a1
-MISC ChangeLog 2400 RMD160 87f8f6748cbdb088c471260576ecc7e060e7bf83 SHA1 96f6d76d0faab503fdd5f94a00d0a1ab62580987 SHA256 91074e473aee4f6a83b84a4583f7b6f42c0f5325e9ad9fcb78a9a84acfc1a6ae
+EBUILD cvxopt-1.1.4-r1.ebuild 1885 RMD160 18f4ae6590d717e0c665f979281b5b7ec799776e SHA1 80c131ab7b3ffd8d24ceffdb876c18cf53beb070 SHA256 db629d97ce4b31b80712a53d3a3f5a85f26c551f036124c99ca5fa1ef6c27bc3
+MISC ChangeLog 2677 RMD160 551e487ddef0aaafa40c6ab0b39a51e403cf2788 SHA1 1eab61352f9d80994ec8309a34bb59c6d1e983d7 SHA256 393990d430a481a218fab62fb2e256f9f0ac5d452bdb33f2cb7520f034604eaa
 MISC metadata.xml 606 RMD160 9356ad8180dba16fff52b57865bcd696d34d495f SHA1 93a097dc5964302ae44ddaf91ce2be510ab7c1cc SHA256 7793793a25bb276c5ebb3df3355beb7cfdb5835edb806805f5d580e78d41518c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8UihcACgkQ1ycZbhPLE2Ar4wCfZsROoSmOxQdYdqm3NsRbp79V
-PjkAniypzACUZEqA5ekUkpIYLpxsGBkQ
-=yPO9
+iEYEARECAAYFAk8VveYACgkQ1ycZbhPLE2ArkgCdGtqVO8+cR7FviwXh3O9vxhfH
+HTgAoKsvqBEppELb1F0TV1fMRyvxwlDY
+=pBI9
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cvxopt/cvxopt-1.1.4.ebuild b/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
index 55cf23220331..021019810d22 100644
--- a/dev-python/cvxopt/cvxopt-1.1.4.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.4-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.ebuild,v 1.2 2012/01/16 20:35:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.1 2012/01/17 18:28:45 bicatali Exp $
 
 EAPI=4
 
@@ -49,13 +49,12 @@ src_prepare(){
 	use_cvx() {
 		if use ${1}; then
 			sed -i \
-				-e "s/\(BUILD_${2^^} =\) 0/\1 1/" \
+				-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
 				setup.py || die
 		fi
 	}
 
 	pkg_lib blas
-	pkg_lib cblas
 	pkg_lib lapack
 	use_cvx gsl && pkg_lib gsl
 	use_cvx fftw && pkg_lib fftw3
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',