Backport distutils patch for stable

Package-Manager: portage-2.2.4.22351-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 554 insertions, 20 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 7211ff323bca..5ae02c336f89 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.204 2013/09/05 18:46:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.205 2013/09/17 05:46:07 bicatali Exp $
+
+  17 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numpy-1.6.2-distutils.patch, numpy-1.6.2-r2.ebuild:
+  Backport distutils patch for stable
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> numpy-1.6.2-r2.ebuild,
   numpy-1.7.1.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f6ac130b152f..a2ccb677effb 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX numpy-1.6.1-atlas.patch 829 SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d SHA512 84e5a820fad9bb2c97c866891b7e4cd5d025c21b4ccff2703b57eabdf3597cb9162d528d13863e1f6fa6b1e50281b2066f12b975feb88cc905b6da6cc60adde5 WHIRLPOOL 1f14425a1dd6717611a77693a90a94e60bde5ecfe82e5d26c0c38aa33e0374b363c135e906ec51c382bf62761d95aa9293d0f98ccf04e07544ad184d39e9d965
+AUX numpy-1.6.2-distutils.patch 20000 SHA256 779c0b03ee25b294f203729e954eed02022113ab18f4a1fbc20c36299dc5c1b8 SHA512 d47c2d4dab77c69fbad4b3a84df493e1e2a584b67d5832b3c11ca5d449935ca4ac5626d3616c8f612e74cb6503ddbf94a44fd1fda7b9aed5f20e8358aaa44c8a WHIRLPOOL bb876d24d56dd13409516e7de3dfce492fd4498ad186016be672b3ef613064c3c7f3fb8f62e0188277d2ea7191efb490e7482fd60413ce0f75df5052c8f8a828
 AUX numpy-1.6.2-test-pareto.patch 1857 SHA256 6e5d42323fdd76ad8e4c7d9dfd313f27e5b301f9ec3a98810779f6e6524e9675 SHA512 342576c546839ed601d32542947b52684b208c89a9fa93176f7d2b1ca77bd7c1179ea2513f094a59a55d01d686cda2b9e2cc07ca386e4c4146fdcc6f980b7235 WHIRLPOOL fae26d2cea2d28b9a569fbf4195401b4b342e25468cf7e3d0750adb306a61d22ed88d1903f8f382740f2a7d76e5c277bb6fd9b622530fe16d14aba0266828583
 AUX numpy-1.7.0-atlas.patch 845 SHA256 fe1097351178aab9fe7fbf4dde87a2e177c53989b6080bb5b2a9059fd596d83f SHA512 a9c4a8b9a11c58462cfc13beec8e5f4045a302c833e792cd42b35d5a0cfb497b594d3cfe8ea51108f447bcdc22308f74bd9dea108de1e6491e3adc761be7dd42 WHIRLPOOL b815cded5082740c8941a6c976345465e1815a926c2bfb8bdb940096f4e928a7065dbbcc3a9b195584dbca0612c725d6a4a6b260fabd50f8ad9af7c29cb9fdab
 AUX numpy-1.7.1-distutils-python33.patch 20008 SHA256 5a5f191321b794fea110610246ccbaf985c790e184ce6df6928af0686cc43acd SHA512 a97db2d74d8be34a84d7aafc992379ecfff1303f1b2ea21689a31183b8c433d02a8c86f4c529ada24451188c3dc6895f83cd06cc7a1ad59a732ec94878875a52 WHIRLPOOL efbdf5c8658cc6038ea8881e493c7653a71d185864a1103d20f157f853641f7a52a70bdec3932ed70ceb6d8fc568fe6c7273e03bba8213e262e9d0d7d83d9a10
@@ -13,26 +14,14 @@ DIST numpy-1.7.1.tar.gz 2838240 SHA256 5525019a3085c3d860e6cfe4c0a30fb65d567626a
 DIST numpy-html-1.7.0.zip 10831068 SHA256 469a8e6f21544204b6e338eb88519c04ed22a6b5e3f3b098f0cccf0ffe08c8b1 SHA512 b68b44102aa4d2996334adce3ddda090f373a4c5bd006daa9cf59f092445d5b768121afe4d10855058d6489ff52bf70a7645b7ff79555de709417f13568bfaac WHIRLPOOL f696258ebb7c78bdfee948bd9119d868b77048c73c805230f0f40d71be891cbfa5bccf21e714cc4389daf1792abb6aeaf3ae18e91889332b9aafa79c865f34a7
 DIST numpy-ref-1.7.0.pdf 5161456 SHA256 0581709ef96441953404bc1369d70117b83359aff94f44779b960bed30a156d7 SHA512 9a80ab2b412aa34ce019454c438b129d1e94b2264306f3644e97c87f4f7b54317ee626274d865c04891005ca8e8f5e3773681a7af590dd89d64df9462d0f0004 WHIRLPOOL 0f10177fd24cfe93555f28440ddc3567a787f2cef336b2f2774b038caafb6807f738d1f3ee3d5a5f26883c567e4017f8365069f25ec7cba5234c537602351729
 DIST numpy-user-1.7.0.pdf 404104 SHA256 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18 SHA512 20cec2f9742c0604d9db9f2e74e7c8fda1782c081c27437a07c2d8cb7f36be6df3e50e5ddf8cc10a076905b2be2b6927af15d0574e3bee2961cf14aaca55ad78 WHIRLPOOL 792c4ccd155ddbb82d8a93959c218bcc001532a6b3c42626bef64c96eb865601f5ee328d1a1627f1656e0b22085c89ede39d7f94183841e1069d183589542ffe
-EBUILD numpy-1.6.2-r2.ebuild 3986 SHA256 55528fabaf2b3ad17c3ebd7c4e2df384f564693d8f1b55dde19b1c170d00d054 SHA512 73df95246097cf801152e9f7beb7fa2ceaefcbb1a3b2bbc86803b827f28e2350e0d5059c010a4ba85fea38eeb89312b75e996238def0ba66425d188f0546b7d1 WHIRLPOOL 2743e238482f7f8bbccd7fa5535484ea7669fdce5801e5f7fab84619fd19767e057648b18779660de966fc4d01c757f6ae6c2b19938b22cfcf33b879e09944bf
+EBUILD numpy-1.6.2-r2.ebuild 4041 SHA256 a19790520f8f2e72424a19fcfb0eb6e6b92f824c65e5d0e0c4186c3623d4468c SHA512 63ebe9d2113905b9da0f567d29a607106ea34bd5bece980684be2cd4e7963af67c33d5e96be210fc5c2befbfcdc2e99358940e05b1c558ca068d6e5b41d5c2e9 WHIRLPOOL 188c736341018499da86161ac3f4dad5bd3387c385dd1fa5b27fd0b465f1ce8335079a305ce93932616bb41f1172721d9d97a7e2cab79cc2c7519cdec6774a7f
 EBUILD numpy-1.7.1.ebuild 4025 SHA256 f20987ab8e6bf8d2c3f7093f47e961e12f11c997b5478c307716214955bcc7a0 SHA512 ba771e03189d88912625044346c9bf399f72277e5a1a7bb8c2e31a0ac4aa126daa33e968b2b4d6ed459a5c1e99ae8a46b798fbc34abb7d3888fbe5b1cdd54639 WHIRLPOOL b3fc3568617271a149570111a8fed5f66b9e98ba189ab495e7e9c3af56c0227cbd4a30274085b32e5260ada07f76da5229387cdecca93f845946102210cb9990
-MISC ChangeLog 28697 SHA256 1036d7150abdd2547914df12c42b677ec112070f1f93a6f3a856f939749da540 SHA512 62ff9d9684cf59730a7da74e478335edfd89a317c977969c202af199f763714c9af1757cabed9064aeaa50f6d94c51a2ec520a9e1f2d39b3ba898a8b1104e556 WHIRLPOOL dbbd4685c8e14ea7a4aec4258d4e252fb7c31c46d703f4380934c556c5f07734a4443107ee87bf97355460ee013e8f4f8e8492c1dc8df052a27cd9eb299247c6
+MISC ChangeLog 28854 SHA256 044ed265a4f10b202c818d17f86434fa9fdb752e988d795b151617a50e30cd73 SHA512 27050840bb6cc541ce4b1afc02526b36da648baad145f4788dc6e4a42cc436f8df58c193e5b7da893c8407345a800157e9b3ab097d7f06057ed3f65b2fe49df3 WHIRLPOOL b742cf3b50032ac9a3fde630c65e3c5766a0e481c27fa7cf7ed18ae03d0baaefb73614f44d0b34831e02111150fc49592d6d0cc566412b2c2ab87c53f88fa7f4
 MISC metadata.xml 690 SHA256 9c315188497956a9b1e2a1373f7830f702cf9b588aabc33a3f5547ab75b20a84 SHA512 1adcf955fdc7f06b56a69c6345b79a4fb0ca0df17cfdcd1f3604a234389534f8f00b88ebddb3e47a39d563d7374d40349c3e4050799a31405446a1629f8c7698 WHIRLPOOL e2b34ab0b391c99a279dd11de292aafd9225f9743ec3bafafd980edb7522e772cde461705d5394569aa8dd73e72a210560eb50a23b2334ab5c12ec064099abd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNKWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOguUQANOhIWMb3/Zada0bOCe1cTIM
-o/MxOygFBV3Whe62hCbpIFhTT2trMewEvEJasEH4CIkFkJKFohWZ4Po3HzRxf7/D
-D7LTENfZ45MT+pQQqy7nJObC4q2pTCbBtCiSEe3aJuQ7iB4SrznXALGGyE4Ar7/q
-jQoc9m4KKqABzej+KeQnIqgW4k7xzDYFXzd9nQxBpoGwA5EDyvzjNQMGbkiqCsvY
-RatIiFQ5JsAP9KJU4ivnWHnBDuuF5qLm2OxkbVoCLBG79OCqjHfViCJH3vOMsaiW
-UlGNcYAY5khR48b+MvEcKa0eJ4XvTOU2U0mWjcp3VVGD354Rpf0sFmTwJaSFP/YW
-MvEFKw7JlGVte2xLAUclNgjFDtr+KcEVfD1+LvgKIDV5yPpwhPT0W9kJ7vfIvbeJ
-7rHIASETuBE8LaMHKTZKd8ELWTc+u6rGQo6OfEji200ZFFdBy7/17LUMIFwFwpsC
-inLMhXuFkNyWJ5wKJkdgO2XVrUz8BUapIOFfJyqx8qCcCuRGm14huvMF0ej7zqqN
-Q07rtOK47PgizAYfDdPPv0lOnHuUSkx+ptKkcJSohbVnKiSzeAS5GTh8bU4x3g73
-/LO8NzmYoP1EDle04rAZ0fB87NXy3wjV5Tb7fcoeXZaH5tJ5ZC8OWNq6oeSAJdwb
-phXsmoUz1N3Jbc/owBBn
-=NfNx
+iEYEAREIAAYFAlI37KcACgkQ1ycZbhPLE2AX0gCeOyX9yfVOwkCfsoa3uQEJhdr0
+kkwAn1e3GGmdDM6iIFF6iM3/UjSQ+9NH
+=c/8r
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.6.2-distutils.patch b/dev-python/numpy/files/numpy-1.6.2-distutils.patch
new file mode 100644
index 000000000000..9fb4d65251ad
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.6.2-distutils.patch
@@ -0,0 +1,540 @@
+--- numpy/distutils/misc_util.py.orig	2013-04-06 22:04:05.000000000 -0700
++++ numpy/distutils/misc_util.py	2013-08-27 11:11:50.970945380 -0700
+@@ -1,3 +1,5 @@
++from __future__ import division, absolute_import, print_function
++
+ import os
+ import re
+ import sys
+@@ -165,7 +167,7 @@
+     fid = open(config_file)
+     mathlibs = []
+     s = '#define MATHLIB'
+-    for line in fid.readlines():
++    for line in fid:
+         if line.startswith(s):
+             value = line[len(s):].strip()
+             if value:
+@@ -218,8 +220,8 @@
+                 else:
+                     if include_non_existing:
+                         new_paths.append(n)
+-                    print('could not resolve pattern in %r: %r' \
+-                              % (local_path,n))
++                    print('could not resolve pattern in %r: %r' %
++                            (local_path,n))
+             else:
+                 n2 = njoin(local_path,n)
+                 if os.path.exists(n2):
+@@ -230,8 +232,8 @@
+                     elif include_non_existing:
+                         new_paths.append(n)
+                     if not os.path.exists(n):
+-                        print('non-existing path in %r: %r' \
+-                              % (local_path,n))
++                        print('non-existing path in %r: %r' %
++                                (local_path,n))
+ 
+         elif is_sequence(n):
+             new_paths.extend(_fix_paths(n,local_path,include_non_existing))
+@@ -249,11 +251,9 @@
+ 
+ _temporary_directory = None
+ def clean_up_temporary_directory():
+-    from numpy.distutils import log
+     global _temporary_directory
+     if not _temporary_directory:
+         return
+-    log.debug('removing %s', _temporary_directory)
+     try:
+         shutil.rmtree(_temporary_directory)
+     except OSError:
+@@ -394,8 +394,7 @@
+         return []
+     modules = []
+     f = open(source,'r')
+-    f_readlines = getattr(f,'xreadlines',f.readlines)
+-    for line in f_readlines():
++    for line in f:
+         m = f90_module_name_match(line)
+         if m:
+             name = m.group('name')
+@@ -557,7 +556,7 @@
+ def get_ext_source_files(ext):
+     # Get sources and any include files in the same directory.
+     filenames = []
+-    sources = filter(is_string, ext.sources)
++    sources = [_m for _m in ext.sources if is_string(_m)]
+     filenames.extend(sources)
+     filenames.extend(get_dependencies(sources))
+     for d in ext.depends:
+@@ -568,13 +567,13 @@
+     return filenames
+ 
+ def get_script_files(scripts):
+-    scripts = filter(is_string, scripts)
++    scripts = [_m for _m in scripts if is_string(_m)]
+     return scripts
+ 
+ def get_lib_source_files(lib):
+     filenames = []
+     sources = lib[1].get('sources',[])
+-    sources = filter(is_string, sources)
++    sources = [_m for _m in sources if is_string(_m)]
+     filenames.extend(sources)
+     filenames.extend(get_dependencies(sources))
+     depends = lib[1].get('depends',[])
+@@ -606,11 +605,29 @@
+     Linux, but not on OS X.
+ 
+     """
+-    so_ext = distutils.sysconfig.get_config_var('SO') or ''
+-    # fix long extension for Python >=3.2, see PEP 3149.
+-    if (not is_python_ext) and 'SOABI' in distutils.sysconfig.get_config_vars():
+-        # Does nothing unless SOABI config var exists
+-        so_ext = so_ext.replace('.' + distutils.sysconfig.get_config_var('SOABI'), '', 1)
++    confvars = distutils.sysconfig.get_config_vars()
++    # SO is deprecated in 3.3.1, use EXT_SUFFIX instead
++    so_ext = confvars.get('EXT_SUFFIX', None)
++    if so_ext is None:
++        so_ext = confvars.get('SO', '')
++
++    if not is_python_ext:
++        # hardcode known values, config vars (including SHLIB_SUFFIX) are
++        # unreliable (see #3182)
++        # darwin, windows and debug linux are wrong in 3.3.1 and older
++        if (sys.platform.startswith('linux') or
++            sys.platform.startswith('gnukfreebsd')):
++            so_ext = '.so'
++        elif sys.platform.startswith('darwin'):
++            so_ext = '.dylib'
++        elif sys.platform.startswith('win'):
++            so_ext = '.dll'
++        else:
++            # fall back to config vars for unknown platforms
++            # fix long extension for Python >=3.2, see PEP 3149.
++            if 'SOABI' in confvars:
++                # Does nothing unless SOABI config var exists
++                so_ext = so_ext.replace('.' + confvars.get('SOABI'), '', 1)
+ 
+     return so_ext
+ 
+@@ -628,7 +645,7 @@
+             if os.path.isfile(s):
+                 filenames.append(s)
+             else:
+-                print('Not existing data file:',s)
++                print('Not existing data file:', s)
+         else:
+             raise TypeError(repr(s))
+     return filenames
+@@ -647,56 +664,13 @@
+             frame = frame.f_back
+         return frame
+ 
+-class SconsInfo(object):
+-    """
+-    Container object holding build info for building a package with scons.
+-
+-    Parameters
+-    ----------
+-    scons_path : str or None
+-        Path to scons script, relative to the directory of setup.py.
+-        If None, no scons script is specified. This can be useful to add only
+-        pre- and post-hooks to a configuration.
+-    parent_name : str or None
+-        Name of the parent package (for example "numpy").
+-    pre_hook : sequence of callables or None
+-        Callables that are executed before scons is invoked.
+-        Each callable should be defined as ``callable(*args, **kw)``.
+-    post_hook : sequence of callables or None
+-        Callables that are executed after scons is invoked.
+-        Each callable should be defined as ``callable(*args, **kw)``.
+-    source_files : list of str or None
+-        List of paths to source files, relative to the directory of setup.py.
+-    pkg_path : str or None
+-        Path to the package for which the `SconsInfo` instance holds the
+-        build info, relative to the directory of setup.py.
+-
+-    Notes
+-    -----
+-    All parameters are available as attributes of a `SconsInfo` instance.
+-
+-    """
+-    def __init__(self, scons_path, parent_name, pre_hook,
+-            post_hook, source_files, pkg_path):
+-        self.scons_path = scons_path
+-        self.parent_name = parent_name
+-        self.pre_hook = pre_hook
+-        self.post_hook = post_hook
+-        self.source_files = source_files
+-        if pkg_path:
+-            self.pkg_path = pkg_path
+-        else:
+-            if scons_path:
+-                self.pkg_path = os.path.dirname(scons_path)
+-            else:
+-                self.pkg_path = ''
+ 
+ ######################
+ 
+ class Configuration(object):
+ 
+     _list_keys = ['packages', 'ext_modules', 'data_files', 'include_dirs',
+-                  'libraries', 'headers', 'scripts', 'py_modules', 'scons_data',
++                  'libraries', 'headers', 'scripts', 'py_modules',
+                   'installed_libraries']
+     _dict_keys = ['package_dir', 'installed_pkg_config']
+     _extra_keys = ['name', 'version']
+@@ -853,7 +827,7 @@
+                                  caller_level = 1):
+         l = subpackage_name.split('.')
+         subpackage_path = njoin([self.local_path]+l)
+-        dirs = filter(os.path.isdir,glob.glob(subpackage_path))
++        dirs = [_m for _m in glob.glob(subpackage_path) if os.path.isdir(_m)]
+         config_list = []
+         for d in dirs:
+             if not os.path.isfile(njoin(d,'__init__.py')):
+@@ -895,7 +869,7 @@
+                 pn = dot_join(*([parent_name] + subpackage_name.split('.')[:-1]))
+                 args = (pn,)
+                 def fix_args_py2(args):
+-                    if setup_module.configuration.func_code.co_argcount > 1:
++                    if setup_module.configuration.__code__.co_argcount > 1:
+                         args = args + (self.top_path,)
+                     return args
+                 def fix_args_py3(args):
+@@ -922,14 +896,14 @@
+ 
+         Parameters
+         ----------
+-        subpackage_name: str,None
++        subpackage_name : str or None
+             Name of the subpackage to get the configuration. '*' in
+             subpackage_name is handled as a wildcard.
+-        subpackage_path: str
++        subpackage_path : str
+             If None, then the path is assumed to be the local path plus the
+             subpackage_name. If a setup.py file is not found in the
+             subpackage_path, then a default configuration is used.
+-        parent_name: str
++        parent_name : str
+             Parent name.
+         """
+         if subpackage_name is None:
+@@ -985,13 +959,13 @@
+ 
+         Parameters
+         ----------
+-        subpackage_name: str
++        subpackage_name : str
+             name of the subpackage
+-        subpackage_path: str
++        subpackage_path : str
+             if given, the subpackage path such as the subpackage is in
+             subpackage_path / subpackage_name. If None,the subpackage is
+             assumed to be located in the local path / subpackage_name.
+-        standalone: bool
++        standalone : bool
+         """
+ 
+         if standalone:
+@@ -1029,10 +1003,10 @@
+ 
+         Parameters
+         ----------
+-        data_path: seq,str
++        data_path : seq or str
+             Argument can be either
+ 
+-                * 2-sequence (<datadir suffix>,<path to data directory>)
++                * 2-sequence (<datadir suffix>, <path to data directory>)
+                 * path to data directory where python datadir suffix defaults
+                   to package dir.
+ 
+@@ -1091,14 +1065,14 @@
+                 pattern_list = allpath(d).split(os.sep)
+                 pattern_list.reverse()
+                 # /a/*//b/ -> /a/*/b
+-                rl = range(len(pattern_list)-1); rl.reverse()
++                rl = list(range(len(pattern_list)-1)); rl.reverse()
+                 for i in rl:
+                     if not pattern_list[i]:
+                         del pattern_list[i]
+                 #
+                 for path in paths:
+                     if not os.path.isdir(path):
+-                        print('Not a directory, skipping',path)
++                        print('Not a directory, skipping', path)
+                         continue
+                     rpath = rel_path(path, self.local_path)
+                     path_list = rpath.split(os.sep)
+@@ -1151,7 +1125,7 @@
+ 
+         Parameters
+         ----------
+-        files: sequence
++        files : sequence
+             Argument(s) can be either
+ 
+                 * 2-sequence (<datadir prefix>,<path to data file(s)>)
+@@ -1330,7 +1304,7 @@
+ 
+         Parameters
+         ----------
+-        files: str, seq
++        files : str or seq
+             Argument(s) can be either:
+ 
+                 * 2-sequence (<includedir suffix>,<path to header file(s)>)
+@@ -1385,9 +1359,9 @@
+ 
+         Parameters
+         ----------
+-        name: str
++        name : str
+             name of the extension
+-        sources: seq
++        sources : seq
+             list of the sources. The list of sources may contain functions
+             (called source generators) which must take an extension instance
+             and a build directory as inputs and return a source file or list of
+@@ -1395,28 +1369,28 @@
+             generated. If the Extension instance has no sources after
+             processing all source generators, then no extension module is
+             built.
+-        include_dirs:
+-        define_macros:
+-        undef_macros:
+-        library_dirs:
+-        libraries:
+-        runtime_library_dirs:
+-        extra_objects:
+-        extra_compile_args:
+-        extra_link_args:
+-        extra_f77_compile_args:
+-        extra_f90_compile_args:
+-        export_symbols:
+-        swig_opts:
+-        depends:
++        include_dirs :
++        define_macros :
++        undef_macros :
++        library_dirs :
++        libraries :
++        runtime_library_dirs :
++        extra_objects :
++        extra_compile_args :
++        extra_link_args :
++        extra_f77_compile_args :
++        extra_f90_compile_args :
++        export_symbols :
++        swig_opts :
++        depends :
+             The depends list contains paths to files or directories that the
+             sources of the extension module depend on. If any path in the
+             depends list is newer than the extension module, then the module
+             will be rebuilt.
+-        language:
+-        f2py_options:
+-        module_dirs:
+-        extra_info: dict,list
++        language :
++        f2py_options :
++        module_dirs :
++        extra_info : dict or list
+             dict or list of dict of keywords to be appended to keywords.
+ 
+         Notes
+@@ -1653,65 +1627,6 @@
+             self.installed_pkg_config[self.name] = [(template, install_dir,
+                 subst_dict)]
+ 
+-    def add_scons_installed_library(self, name, install_dir):
+-        """
+-        Add a scons-built installable library to distutils.
+-
+-        Parameters
+-        ----------
+-        name : str
+-            The name of the library.
+-        install_dir : str
+-            Path to install the library, relative to the current sub-package.
+-
+-        """
+-        install_dir = os.path.join(self.package_path, install_dir)
+-        self.installed_libraries.append(InstallableLib(name, {}, install_dir))
+-
+-    def add_sconscript(self, sconscript, subpackage_path=None,
+-                       standalone = False, pre_hook = None,
+-                       post_hook = None, source_files = None, package_path=None):
+-        """Add a sconscript to configuration.
+-
+-        pre_hook and post hook should be sequences of callable, which will be
+-        use before and after executing scons. The callable should be defined as
+-        callable(*args, **kw). It is ugly, but well, hooks are ugly anyway...
+-
+-        sconscript can be None, which can be useful to add only post/pre
+-        hooks."""
+-        if standalone:
+-            parent_name = None
+-        else:
+-            parent_name = self.name
+-
+-        dist = self.get_distribution()
+-        # Convert the sconscript name to a relative filename (relative from top
+-        # setup.py's directory)
+-        fullsconsname = self.paths(sconscript)[0]
+-
+-        # XXX: Think about a way to automatically register source files from
+-        # scons...
+-        full_source_files = []
+-        if source_files:
+-            full_source_files.extend([self.paths(i)[0] for i in source_files])
+-
+-        scons_info = SconsInfo(fullsconsname, parent_name,
+-                               pre_hook, post_hook,
+-                               full_source_files, package_path)
+-        if dist is not None:
+-            if dist.scons_data is None:
+-                dist.scons_data = []
+-            dist.scons_data.append(scons_info)
+-            self.warn('distutils distribution has been initialized,'\
+-                      ' it may be too late to add a subpackage '+ subpackage_name)
+-            # XXX: we add a fake extension, to correctly initialize some
+-            # options in distutils command.
+-            dist.add_extension('', sources = [])
+-        else:
+-            self.scons_data.append(scons_info)
+-            # XXX: we add a fake extension, to correctly initialize some
+-            # options in distutils command.
+-            self.add_extension('', sources = [])
+ 
+     def add_scripts(self,*files):
+         """Add scripts to configuration.
+@@ -2086,11 +2001,6 @@
+         """
+         self.py_modules.append((self.name,name,generate_config_py))
+ 
+-    def scons_make_config_py(self, name = '__config__'):
+-        """Generate package __config__.py file containing system_info
+-        information used during building the package.
+-        """
+-        self.py_modules.append((self.name, name, scons_generate_config_py))
+ 
+     def get_info(self,*names):
+         """Get resources information.
+@@ -2098,7 +2008,7 @@
+         Return information (from system_info.get_info) for all of the names in
+         the argument list in a single dictionary.
+         """
+-        from system_info import get_info, dict_append
++        from .system_info import get_info, dict_append
+         info_dict = {}
+         for a in names:
+             dict_append(info_dict,**get_info(a))
+@@ -2233,57 +2143,18 @@
+     return info
+ 
+ def is_bootstrapping():
+-    import __builtin__
++    if sys.version_info[0] >= 3:
++        import builtins
++    else:
++        import __builtin__ as builtins
++
+     try:
+-        __builtin__.__NUMPY_SETUP__
++        builtins.__NUMPY_SETUP__
+         return True
+     except AttributeError:
+         return False
+         __NUMPY_SETUP__ = False
+ 
+-def scons_generate_config_py(target):
+-    """generate config.py file containing system_info information
+-    used during building the package.
+-
+-    usage:
+-        config['py_modules'].append((packagename, '__config__',generate_config_py))
+-    """
+-    from distutils.dir_util import mkpath
+-    from numscons import get_scons_configres_dir, get_scons_configres_filename
+-    d = {}
+-    mkpath(os.path.dirname(target))
+-    f = open(target, 'w')
+-    f.write('# this file is generated by %s\n' % (os.path.abspath(sys.argv[0])))
+-    f.write('# it contains system_info results at the time of building this package.\n')
+-    f.write('__all__ = ["show"]\n\n')
+-    confdir = get_scons_configres_dir()
+-    confilename = get_scons_configres_filename()
+-    for root, dirs, files in os.walk(confdir):
+-        if files:
+-            file = os.path.join(root, confilename)
+-            assert root.startswith(confdir)
+-            pkg_name = '.'.join(root[len(confdir)+1:].split(os.sep))
+-            fid = open(file, 'r')
+-            try:
+-                cnt = fid.read()
+-                d[pkg_name] = eval(cnt)
+-            finally:
+-                fid.close()
+-    # d is a dictionary whose keys are package names, and values the
+-    # corresponding configuration. Each configuration is itself a dictionary
+-    # (lib : libinfo)
+-    f.write('_config = %s\n' % d)
+-    f.write(r'''
+-def show():
+-    for pkg, config in _config.items():
+-        print("package %s configuration:" % pkg)
+-        for lib, libc in config.items():
+-            print('    %s' % lib)
+-            for line in libc.split('\n'):
+-                print('\t%s' % line)
+-    ''')
+-    f.close()
+-    return target
+ 
+ #########################
+ 
+--- numpy/distutils/tests/test_misc_util.py.orig	2013-04-06 22:04:05.000000000 -0700
++++ numpy/distutils/tests/test_misc_util.py	2013-08-27 11:14:23.438843136 -0700
+@@ -1,7 +1,9 @@
+ #!/usr/bin/env python
++from __future__ import division, absolute_import, print_function
+ 
+ from numpy.testing import *
+-from numpy.distutils.misc_util import appendpath, minrelpath, gpaths, rel_path
++from numpy.distutils.misc_util import appendpath, minrelpath, \
++    gpaths, get_shared_lib_extension
+ from os.path import join, sep, dirname
+ 
+ ajoin = lambda *paths: join(*((sep,)+paths))
+@@ -49,10 +51,25 @@
+     def test_gpaths(self):
+         local_path = minrelpath(join(dirname(__file__),'..'))
+         ls = gpaths('command/*.py', local_path)
+-        assert join(local_path,'command','build_src.py') in ls,`ls`
++        assert join(local_path,'command','build_src.py') in ls,repr(ls)
+         f = gpaths('system_info.py', local_path)
+-        assert join(local_path,'system_info.py')==f[0],`f`
++        assert join(local_path,'system_info.py')==f[0],repr(f)
+ 
++class TestSharedExtension(TestCase):
++
++    def test_get_shared_lib_extension(self):
++        import sys
++        ext = get_shared_lib_extension(is_python_ext=False)
++        if sys.platform.startswith('linux'):
++            assert_equal(ext, '.so')
++        elif sys.platform.startswith('gnukfreebsd'):
++            assert_equal(ext, '.so')
++        elif sys.platform.startswith('darwin'):
++            assert_equal(ext, '.dylib')
++        elif sys.platform.startswith('win'):
++            assert_equal(ext, '.dll')
++        # just check for no crash
++        assert_(get_shared_lib_extension(is_python_ext=True))
+ 
+ if __name__ == "__main__":
+     run_module_suite()
diff --git a/dev-python/numpy/numpy-1.6.2-r2.ebuild b/dev-python/numpy/numpy-1.6.2-r2.ebuild
index e0e2fdc35c61..9f096ecb3f49 100644
--- a/dev-python/numpy/numpy-1.6.2-r2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.17 2013/09/05 18:46:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.18 2013/09/17 05:46:07 bicatali Exp $
 
 EAPI=5
 
@@ -63,7 +63,8 @@ pc_libs() {
 python_prepare_all() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.1-atlas.patch \
-		"${FILESDIR}"/${P}-test-pareto.patch
+		"${FILESDIR}"/${PN}-1.6.2-distutils.patch \
+		"${FILESDIR}"/${PN}-1.6.2-test-pareto.patch
 
 	if use lapack; then
 		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"