Version bump.

Package-Manager: portage-2.2.0_alpha30_p21/cvs/Linux x86_64

4 files changed, 204 insertions, 6 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index b3d0dde3895b..9d533e9e72e0 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.130 2011/04/29 20:35:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.131 2011/05/01 00:23:21 arfrever Exp $
+
+*setuptools-0.6.16 (01 May 2011)
+
+  01 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +setuptools-0.6.16.ebuild,
+  +files/distribute-0.6.16-fix_deprecation_warnings.patch:
+  Version bump.
 
   29 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> setuptools-0.6.15.ebuild:
   ppc64 stable wrt #364413
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 35a77885760a..3d7b4a004f16 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,19 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX distribute-0.6.12-disable_versioned_easy_install.patch 303 RMD160 e66cc81d50c4069f6cec5222280f2e8ae514753c SHA1 5b02f41ac641bc2e3e55f55b713c2c8a48e3730b SHA256 cd1eea81e845f891316006527becacaa3f1f511e41b8fec5a6b01954fbe997a9
 AUX distribute-0.6.12-fix_deprecation_warnings.patch 4846 RMD160 13b93e767610c9233495932f7e0bde397687da71 SHA1 7da66412f4995b9ea30b7e0da2b57785048a71f3 SHA256 e2f340ddf4ca98b1a5dd4fe342f7434232dffe17bf38a2fcdcc9f4377e4826fb
+AUX distribute-0.6.16-fix_deprecation_warnings.patch 4880 RMD160 0b2457f386e38c58a1d2161ada3051637a1e3d86 SHA1 a3f83f340f4955e52d798d06547e4568842c9483 SHA256 abf78f789b846c32e1e857b3f50347034b68592a7d0e12d34a3d9d463323dfcd
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.14.tar.gz 281527 RMD160 f56b449a71293df02636253e6667a971fef7469e SHA1 6bea50b97f36bf751548bb486a534204a690aa4d SHA256 16d5da8211d74eb11f2744c5945a3c7fcae9abbfebb56ea493f177a45d2e5bec
 DIST distribute-0.6.15.tar.gz 289103 RMD160 6148fec3096d201ca1ca1fec895aa529e92b70fe SHA1 af088df456ea6b25c0e23647648fd317ed6e0d1b SHA256 5913f99039d78fde1a47057b07c8d3e5ef9ee55ce769b8a1ed8e01e2ff03cb50
+DIST distribute-0.6.16.tar.gz 288263 RMD160 47e04a6e11665ed7face5dee98d7ee55e9100205 SHA1 d31026d1b80f6340d4a85b9b45e5a5703d443104 SHA256 1edb8f34303a9af42db419bc5cfd189572351797d57b62c03e6dc7bf61168b56
 EBUILD setuptools-0.6.14.ebuild 1762 RMD160 df1c20e7cc5558a6eea33e619534ba70126e3c15 SHA1 3d2df01ce5be99902d7c749a3e398b4e962f2873 SHA256 849d10ed8fff63920c64174210d2f95e00c366e3134ca328dc7578cfd4e81f13
 EBUILD setuptools-0.6.15.ebuild 1781 RMD160 23c39f6446157920f50a2ff5212031621ae4c81c SHA1 eb7575dd17c80e3e79fa706e929c7a7b4c7598c6 SHA256 a40c9294b6dfb3adea57ff2955c78063e70c62f29d7a5e3eb325cb53de174ba7
-MISC ChangeLog 18607 RMD160 99d1a6a92f785a5529a439184e3b0d582394e5eb SHA1 ed6fbb9d4f70a105edc3c035a2268867b287e28c SHA256 bbe59a2a9d5ef4ca1f4af10899b5d94a39402d8791fa0564d39ad2e1755ae52e
+EBUILD setuptools-0.6.16.ebuild 1783 RMD160 f341eae0e72d0d2c32cc074a36d693b3a2eeb06b SHA1 0b39ece6045e63523c199d67f1eeec1aee5b16e9 SHA256 25acafc7fa464638eaed4f2ef987512856841ed9f01ad6143573d1a3752a2a4c
+MISC ChangeLog 18818 RMD160 bba061bfae4902db6ed08e5e15843f95d537ec31 SHA1 5903b36f970b32943b787c95d8a7d2a7e5b5dcde SHA256 54d0575e1650661e72c76c6e002a25b6715713d3d749c688e86f9dfcb1b990b7
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk27IXQACgkQXkR9YqOcLPFsEwD+O098/U7M7Y+kBco8igY80GJr
-81cJBLEbMFaV6gfb6GUA/RhrcErv5PeEZ+hy3mbu32Zp9CjbCjiqo0wIt4bioYfT
-=+gC/
+iQIcBAEBAgAGBQJNvKgEAAoJENgZr6v6gHY0QKsQAJmczPnJJP6PZHSkqtMfqcPo
+wP3LYzkmNRCbnEkrvulEaDpwYloPPl94f4ss0bIal8Cxde7ufXuCQCTDFUcGn8eY
+qJZAu8ProvZNbrwRHDTICSYis5BE2OvfkVkA6caMlp6d4T59/8+QNvKqO3T6UGNn
+HnwzyO6/IBcm4HHrVeag7Nuwz4SySmOigVk6Q/RO/S/5Ic35l1yRX60B+v6bBq3n
+D7J7e/jf9s7W3yL49WoRZwVq6Lu09PcXFBekb5jXTB0UTQ0XeuA3NlLtapAC4GW2
+8F725lLbgHy4g6XL+oC2LXpNF4DuokNSKiBCUN+PRTRNMWaoKd2dPEtiXSaUUeUV
+cvCKLInDoWkh0U9njFZFnkXGgUzBYJsY/y2oaduZNgEToJLRALAs8UPPLwAJwNqH
+bbqCNv4ZkRXOYnEzdt5o5zqOilLe7Uq2NxmTRXnwXpBJJlVUnO1/0HrvDAuRY3ER
+AWAr7Hi+CtH789kLwjEEXt/LhSiGZ3S4ZuVxqcXqnLbZh9+3f3OBGhXp+MFRCn/a
+T7hCYiB82v90We/qEqbECz643Vazj+12hE0Q7Fe0jSEVo5AyegzNwxXkIeoGI/QN
+wc2AMKfLeW+jkUhNApOgnTHDN45pncbHlai805bR7Kzj8NDKj5zhydRsdEGKkrdc
+9yBn9fqzNTqYzHzDIjVS
+=Cf18
 -----END PGP SIGNATURE-----
diff --git a/dev-python/setuptools/files/distribute-0.6.16-fix_deprecation_warnings.patch b/dev-python/setuptools/files/distribute-0.6.16-fix_deprecation_warnings.patch
new file mode 100644
index 000000000000..b8128c238e4d
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.16-fix_deprecation_warnings.patch
@@ -0,0 +1,123 @@
+--- pkg_resources.py
++++ pkg_resources.py
+@@ -210,9 +210,10 @@
+     needs some hacks for Linux and Mac OS X.
+     """
+     try:
+-        from distutils.util import get_platform
+-    except ImportError:
++        # Python 2.7 or >=3.2
+         from sysconfig import get_platform
++    except ImportError:
++        from distutils.util import get_platform
+ 
+     plat = get_platform()
+     if sys.platform == "darwin" and not plat.startswith('macosx-'):
+--- setuptools/command/bdist_egg.py
++++ setuptools/command/bdist_egg.py
+@@ -7,10 +7,14 @@
+ from setuptools import Command
+ from distutils.dir_util import remove_tree, mkpath
+ try:
+-    from distutils.sysconfig import get_python_version, get_python_lib
++    # Python 2.7 or >=3.2
++    from sysconfig import get_path, get_python_version
++    def _get_purelib():
++        return get_path("purelib")
+ except ImportError:
+-    from sysconfig import get_python_version
+-    from distutils.sysconfig import get_python_lib
++    from distutils.sysconfig import get_python_version, get_python_lib
++    def _get_purelib():
++        return get_python_lib(False)
+ 
+ from distutils import log
+ from distutils.errors import DistutilsSetupError
+@@ -130,7 +134,7 @@
+         # Hack for packages that install data to install's --install-lib
+         self.get_finalized_command('install').install_lib = self.bdist_dir
+ 
+-        site_packages = os.path.normcase(os.path.realpath(get_python_lib()))
++        site_packages = os.path.normcase(os.path.realpath(_get_purelib()))
+         old, self.distribution.data_files = self.distribution.data_files,[]
+ 
+         for item in old:
+--- setuptools/command/build_ext.py
++++ setuptools/command/build_ext.py
+@@ -9,9 +9,14 @@
+ from distutils.file_util import copy_file
+ from setuptools.extension import Library
+ from distutils.ccompiler import new_compiler
+-from distutils.sysconfig import customize_compiler, get_config_var
+-get_config_var("LDSHARED")  # make sure _config_vars is initialized
+-from distutils.sysconfig import _config_vars
++try:
++    # Python 2.7 or >=3.2
++    from distutils.ccompiler import customize_compiler
++    from sysconfig import get_config_var, _CONFIG_VARS
++except ImportError:
++    from distutils.sysconfig import customize_compiler, get_config_var
++    get_config_var("LDSHARED")  # make sure _config_vars is initialized
++    from distutils.sysconfig import _config_vars as _CONFIG_VARS
+ from distutils import log
+ from distutils.errors import *
+ 
+@@ -133,16 +138,16 @@
+             compiler=self.compiler, dry_run=self.dry_run, force=self.force
+         )
+         if sys.platform == "darwin":
+-            tmp = _config_vars.copy()
++            tmp = _CONFIG_VARS.copy()
+             try:
+                 # XXX Help!  I don't have any idea whether these are right...
+-                _config_vars['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
+-                _config_vars['CCSHARED'] = " -dynamiclib"
+-                _config_vars['SO'] = ".dylib"
++                _CONFIG_VARS['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
++                _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
++                _CONFIG_VARS['SO'] = ".dylib"
+                 customize_compiler(compiler)
+             finally:
+-                _config_vars.clear()
+-                _config_vars.update(tmp)
++                _CONFIG_VARS.clear()
++                _CONFIG_VARS.update(tmp)
+         else:
+             customize_compiler(compiler)
+ 
+--- setuptools/command/easy_install.py
++++ setuptools/command/easy_install.py
+@@ -15,9 +15,22 @@
+ from setuptools import Command, _dont_write_bytecode
+ from setuptools.sandbox import run_setup
+ from distutils import log, dir_util
++try:
++    # Python 2.7 or >=3.2
++    from sysconfig import get_config_vars, get_path
++    def _get_platlib():
++        return get_path("platlib")
++    def _get_purelib():
++        return get_path("purelib")
++except ImportError:
++    from distutils.sysconfig import get_config_vars, get_python_lib
++    def _get_platlib():
++        return get_python_lib(True)
++    def _get_purelib():
++        return get_python_lib(False)
++
+ from distutils.util import get_platform
+ from distutils.util import convert_path, subst_vars
+-from distutils.sysconfig import get_python_lib, get_config_vars
+ from distutils.errors import DistutilsArgError, DistutilsOptionError, \
+     DistutilsError, DistutilsPlatformError
+ from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
+@@ -1348,8 +1361,7 @@
+                                          'Python',
+                                          sys.version[:3],
+                                          'site-packages'))
+-    for plat_specific in (0,1):
+-        site_lib = get_python_lib(plat_specific)
++    for site_lib in (_get_purelib(), _get_platlib()):
+         if site_lib not in sitedirs: sitedirs.append(site_lib)
+ 
+     if HAS_USER_SITE:
diff --git a/dev-python/setuptools/setuptools-0.6.16.ebuild b/dev-python/setuptools/setuptools-0.6.16.ebuild
new file mode 100644
index 000000000000..6409446d4125
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6.16.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.16.ebuild,v 1.1 2011/05/01 00:23:21 arfrever Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+MY_PN="distribute"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distribute (fork of Setuptools) is a collection of extensions to Distutils"
+HOMEPAGE="http://pypi.python.org/pypi/distribute"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt"
+PYTHON_MODNAME="easy_install.py pkg_resources.py setuptools site.py"
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
+	epatch "${FILESDIR}/distribute-0.6.12-disable_versioned_easy_install.patch"
+	epatch "${FILESDIR}/distribute-0.6.16-fix_deprecation_warnings.patch"
+
+	# Disable tests requiring network connection.
+	rm -f setuptools/tests/test_packageindex.py
+}
+
+src_test() {
+	# test_install_site_py fails with disabled byte-compiling in Python 2.7 / >=3.2.
+	python_enable_pyc
+
+	distutils_src_test
+
+	python_disable_pyc
+	find "(" -name "*.pyc" -o -name "*\$py.class" ")" -print0 | xargs -0 rm -f
+	find -name "__pycache__" -print0 | xargs -0 rmdir
+}
+
+src_install() {
+	DONT_PATCH_SETUPTOOLS="1" distutils_src_install
+}