- update to 1.8.0

- clarify LICENSE (BSD3C)
- suppor staging

while here:
- utilize PYTHON_PY3K_PLIST_HACK
- install docs uncoditionally into stage area
- convert LIB_DEPENDS to the new notation
- sort packing list

PR:		186677
Submitted by:	Johannes Jost Meixner <xmj@chaot.net>

4 files changed, 12 insertions, 12 deletions

diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
index 9fc8e28faf26..a815cd68d724 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
@@ -1,6 +1,6 @@
 --- numpy/distutils/fcompiler/__init__.py.orig	2008-04-06 23:03:15.000000000 +0900
 +++ numpy/distutils/fcompiler/__init__.py	2008-04-06 23:08:56.000000000 +0900
-@@ -173,7 +173,7 @@
+@@ -179,7 +179,7 @@
      # gnu95 compiler type when there are F90 sources.
      suggested_f90_compiler = None
  
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
index 35862e5dc671..bfcc57bc9145 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
@@ -1,6 +1,6 @@
 --- numpy/distutils/fcompiler/gnu.py.orig	2007-11-07 16:05:14.000000000 -0600
 +++ numpy/distutils/fcompiler/gnu.py	2008-04-07 13:54:56.000000000 -0500
-@@ -48,7 +48,7 @@
+@@ -66,7 +66,7 @@
      # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5)
      # GNU Fortran (GCC) 3.4.2 (mingw-special)
  
@@ -9,7 +9,7 @@
      executables = {
          'version_cmd'  : [None, "--version"],
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
-@@ -72,7 +72,7 @@
+@@ -90,7 +90,7 @@
          for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
              executables[key].append('-mno-cygwin')
  
@@ -18,7 +18,7 @@
  
      suggested_f90_compiler = 'gnu95'
  
-@@ -295,7 +295,7 @@
+@@ -249,7 +249,7 @@
      #       GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
      #       GNU Fortran (GCC) 4.3.0 20070316 (experimental)
  
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py
index e3435c1ad5c1..c71c7f922b03 100644
--- a/math/py-numpy/files/patch-numpy-distutils-system_info.py
+++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py
@@ -1,6 +1,6 @@
 --- numpy/distutils/system_info.py.orig	2013-02-09 22:04:56.000000000 +0100
 +++ numpy/distutils/system_info.py	2013-03-22 21:01:34.000000000 +0100
-@@ -983,8 +983,8 @@
+@@ -995,8 +995,8 @@
      dir_env_var = 'ATLAS'
      _lib_names = ['f77blas', 'cblas']
      if sys.platform[:7] == 'freebsd':
diff --git a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py b/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
index 3dc094c82d60..babaadb0779b 100644
--- a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
+++ b/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
@@ -1,14 +1,14 @@
 --- numpy/f2py/f2py2e.py.orig	2012-01-25 06:59:14.651304791 -0600
 +++ numpy/f2py/f2py2e.py	2012-01-25 07:00:58.475075133 -0600
-@@ -514,6 +514,7 @@
-     include_dirs, sources = filter_files('-I','',sources,remove_prefix=1)
-     library_dirs, sources = filter_files('-L','',sources,remove_prefix=1)
-     libraries, sources = filter_files('-l','',sources,remove_prefix=1)
+@@ -520,6 +520,7 @@
+     include_dirs, sources = filter_files('-I', '', sources, remove_prefix=1)
+     library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1)
+     libraries, sources = filter_files('-l', '', sources, remove_prefix=1)
 +    extra_link_args, sources = filter_files('-Wl,','',sources,remove_prefix=0)
-     undef_macros, sources = filter_files('-U','',sources,remove_prefix=1)
-     define_macros, sources = filter_files('-D','',sources,remove_prefix=1)
+     undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1)
+     define_macros, sources = filter_files('-D', '', sources, remove_prefix=1)
      using_numarray = 0
-@@ -549,6 +550,7 @@
+@@ -555,6 +556,7 @@
                  'undef_macros': undef_macros,
                  'extra_objects': extra_objects,
                  'f2py_options': f2py_flags,