Version bump

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

2 files changed, 0 insertions, 80 deletions

diff --git a/sci-libs/scipy/files/scipy-0.6.0-stsci.patch b/sci-libs/scipy/files/scipy-0.6.0-stsci.patch
deleted file mode 100644
index 056837b2f9b1..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-stsci.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- scipy/stsci/image/setup.py.orig	1970-01-01 01:00:00.000000000 +0100
-+++ scipy/stsci/image/setup.py	2007-02-07 01:20:26.000000000 +0000
-@@ -0,0 +1,22 @@
-+#!/usr/bin/env python
-+import numpy
-+
-+def configuration(parent_package='',top_path=None):
-+    from numpy.distutils.misc_util import Configuration
-+    config = Configuration('image',parent_package,top_path,
-+                           package_path='lib')
-+    config.add_extension('_combine',
-+                         sources=["src/_combinemodule.c"],
-+                         define_macros = [('NUMPY', '1')],
-+                         include_dirs = [numpy.get_numarray_include()])
-+    return config
-+
-+if __name__ == "__main__":
-+    from numpy.distutils.core import setup
-+    config = configuration(top_path='').todict() 
-+    setup(author='Todd Miller',
-+          author_email = 'help@stsci.edu',
-+          description = 'image array manipulation functions',
-+          version = '2.0',
-+          **config)
-+
---- scipy/stsci/convolve/setup.py.orig	1970-01-01 01:00:00.000000000 +0100
-+++ scipy/stsci/convolve/setup.py	2007-03-14 16:52:59.000000000 +0000
-@@ -0,0 +1,27 @@
-+#!/usr/bin/env python
-+import numpy
-+
-+def configuration(parent_package='',top_path=None):
-+    from numpy.distutils.misc_util import Configuration
-+    config = Configuration('convolve',parent_package,top_path,
-+                           package_path='lib')
-+
-+    config.add_extension('_correlate',
-+                         sources=["src/_correlatemodule.c"],
-+                         define_macros = [('NUMPY', '1')],
-+                         include_dirs = [numpy.get_numarray_include()])
-+    config.add_extension('_lineshape',
-+                         sources=["src/_lineshapemodule.c"],
-+                         define_macros = [('NUMPY', '1')],
-+                         include_dirs = [numpy.get_numarray_include()])
-+    return config
-+
-+if __name__ == "__main__":
-+    from numpy.distutils.core import setup
-+    config = configuration(top_path='').todict() 
-+    setup(author='Todd Miller',
-+          author_email = 'help@stsci.edu',
-+          description = 'image array convolution functions',
-+          version = '2.0',
-+          **config)
-+
diff --git a/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch b/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch
deleted file mode 100644
index e6933f0cf18b..000000000000
--- a/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://projects.scipy.org/scipy/changeset/6646
-
---- scipy/sparse/sparsetools/setup.py
-+++ scipy/sparse/sparsetools/setup.py
-@@ -9,7 +9,9 @@
-     for fmt in ['csr','csc','coo','bsr','dia']:
-         sources = [ fmt + '_wrap.cxx' ]
-         depends = [ fmt + '.h' ]
--        config.add_extension('_' + fmt, sources=sources, depends=depends)
-+        config.add_extension('_' + fmt, sources=sources,
-+            define_macros=[('__STDC_FORMAT_MACROS', 1)],
-+            depends=depends)
- 
-     return config
- 
---- scipy/sparse/sparsetools/SConscript
-+++ scipy/sparse/sparsetools/SConscript
-@@ -3,6 +3,7 @@
- from numscons import GetNumpyEnvironment
- 
- env = GetNumpyEnvironment(ARGUMENTS)
-+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS')
- 
- for fmt in ['csr','csc','coo','bsr','dia']:
-     sources = [ fmt + '_wrap.cxx' ]