Version bump.

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

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 4155ba933f00f7dd83688f59d3603cbcebfa7de2..551ae51e7bdfaff9ffa77bd2df3450710aba6972 100644 (file)
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.105 2010/02/13 15:49:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.106 2010/05/06 22:18:13 arfrever Exp $
+
+*setuptools-0.6.12 (06 May 2010)
+
+  06 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +setuptools-0.6.12.ebuild,
+  +files/distribute-0.6.12-disable_versioned_easy_install.patch,
+  +files/distribute-0.6.12-fix_deprecation_warnings.patch:
+  Version bump.
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> setuptools-0.6.10.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #300709

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c85a594b0dcaf75bca2767bebb0f5b9c05583f1a..01fa023f619891f97d19b00db1cdaafaca2bc48a 100644 (file)
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,12 @@
 AUX distribute-0.6-provide_setuptools.patch 1738 RMD160 aac0fd198e7607d8c5ec2c4e6cea82d44b6e6fe6 SHA1 d9c575419313561d1ef6636e349b9241de7e40f3 SHA256 2b7f5a271a71e09a2504a1adf1ad3ad64cdde7ec637101c16ca7a7f353a26a35
 AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
+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.8-C_locale_tests.patch 550 RMD160 a0f46df17ceb637896def7373458c30d4021e5a8 SHA1 0647f180eb0f3b19aa31d11774a8b3f69d1c8a8f SHA256 9bad9237138015e0fe921a6b594f2fdd21559b096defa5afc5923a081fc18bb2
 AUX distribute-0.6.8-fix_tests.patch 1833 RMD160 240dbd0d9a1ebd3a505f6d7905ecdbfc26ac332d SHA1 cacd06c2d1bd35b474c8320c38db83128d19a7e3 SHA256 114307b32e703edb6e66b14260c51e4064fc008cf25dcbeb2db90202ca340e11
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.10.tar.gz 385641 RMD160 4c8586ff3e65079ebf8df665a2364c6a11c00474 SHA1 60b29c6ffbd9ce5f4cbaebba809a8316cf198462 SHA256 3046d9d6d4acedf5a7e2aa73f6370a0f9bf1556faad2904523f16c0945847630
+DIST distribute-0.6.12.tar.gz 407748 RMD160 388abe8b8ef6659d06e4f64c3257f8104a6235f2 SHA1 7490740e2eaa4137b16df8d954f3245ae38fd443 SHA256 4491bbc9e65f4ed7ad16c77720c30611c061e0149134c827d0756fdbef0ffdee
 DIST distribute-0.6.3.tar.gz 412848 RMD160 100b4b9a54589608ae2c5f71f9172088a99b8223 SHA1 f259822547f09726d7c96258a6b3bb6ae9bcb75a SHA256 cc560ae693fe9acb5a525ebe2b5ec0dcf0b05808e999d464dc9bca30d175a466
 DIST distribute-0.6.4.tar.gz 519338 RMD160 6cc5e12e7d1bb268f38b22f688a80e2c3e66c658 SHA1 a2f64bd8552a2c47fb0aefea0fa0e29d992f9fa0 SHA256 27bb04614e07d819f703e9d8310e6438160efbab4c30efc6dc257e65f06ac079
 DIST distribute-0.6.6.tar.gz 527816 RMD160 d225ade6b99de9fc2ca5e353315c9db14b11cad8 SHA1 922e41fd85bc066957fd35a5120648e93a57d1e9 SHA256 94362439ad8aa81048f586d4d7350dfdc710f9ab82244219d34d9208bf7fb7a4
@@ -12,10 +15,11 @@ DIST distribute-0.6.tar.gz 258257 RMD160 42ebd5e9e5047d5722d63cb0f7f07e351e5c6de
 DIST setuptools-0.6c9.tar.gz 252744 RMD160 bc0ee3821e76b57fd13425b16c4419dbccf95ed9 SHA1 79086433b341f0c1df45e10d586a7d3cc25089f1 SHA256 e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8
 EBUILD setuptools-0.6-r1.ebuild 1424 RMD160 8f8eb2f992f91ecb019923181630e914c5312a9b SHA1 883a6f7769b2902ed9dbffe40f708eea4d321aca SHA256 44ce2237144d2cf84ab8d44a44de51cea345e00f97dcf1fda05d93d64fb95565
 EBUILD setuptools-0.6.10.ebuild 1623 RMD160 70f8fd29c0e2bf99654caf9aeb250797e8dc7b28 SHA1 84b19333a6eaba6e1021233f25be71cd99114fc8 SHA256 bbc228046e23d9a2dd1a90a310db7e95e3fab75adde015be5600405d935e8c6d
+EBUILD setuptools-0.6.12.ebuild 1775 RMD160 18705c363607e4d5682f8e98058213f9a1d24532 SHA1 f1640f75ee1b0b1f0fd66ed6e0dcabae91281f54 SHA256 5c7ffc721eb58865d0470763f77ca117817cfe9885a7bbc1fa1afdecc390a672
 EBUILD setuptools-0.6.3-r3.ebuild 1607 RMD160 b6335e5e93c2b8695d7778d784284bb23e0dd250 SHA1 88fd6ef35cb432560bd9f88a46e661dc31e7495d SHA256 7a1c9eaf5081bcca1f9108024c6bd45c93a69b858b8cec44f17e0fee205280e6
 EBUILD setuptools-0.6.4.ebuild 1600 RMD160 9472d453d0e66d0396201c97fa3d992bc8a709e8 SHA1 742683992f457a5c2ac300c51917c4b32cae45e3 SHA256 1f03e722a5f5869be1aecbd009a18e9f0e66fef57ae42fc7014d809c9072e7f2
 EBUILD setuptools-0.6.6.ebuild 1831 RMD160 1b031248925c7368c8352241e7b8d9d566938289 SHA1 787e443320322cb38243fe074b676d1886f9b55d SHA256 72e167f4b58ae8c5f560f925f04099c160ff7e85932259d073b5145a73a6ec6e
 EBUILD setuptools-0.6.8-r1.ebuild 2121 RMD160 be7da81a8f86d51d096a9d7aab72b7f5c56ddc1a SHA1 5edce5298fa6935a3cd4c8f3e6afba80d7c94969 SHA256 6d332f0b0637510add1226af4e08e6b1927fe9991e455def38ef605dd0bfb898
 EBUILD setuptools-0.6_rc9-r1.ebuild 1215 RMD160 1fc0ec07a0f911790b9d4ebd2a70107328ee9b22 SHA1 0a4c7de7e3747322be1bdeb7e698863e44f44e3f SHA256 740faf17e85536e171cdfc9a680f9acd2d6cb48e219ab81a050e6c00a811937f
-MISC ChangeLog 15503 RMD160 e13fdb8e72f46872396ac36dad85187f3ce454ea SHA1 116e58e28f2066cd98e47618682995eecc0a0668 SHA256 51b32c9272dc3fb552d8c0281b5b66cb6553e7dcdb1d735cc5b7b65b7ec6839d
+MISC ChangeLog 15781 RMD160 5bc50487e9b50caa395002c5fd70d85f706a6d03 SHA1 76911a1723bd5ed5401b14a3b6c9e3e0cd6bb97a SHA256 5be22f582ed8b3e468819e45b7635efb6675ad51692a5b8daa6719fe9c507569
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a

diff --git a/dev-python/setuptools/files/distribute-0.6.12-disable_versioned_easy_install.patch b/dev-python/setuptools/files/distribute-0.6.12-disable_versioned_easy_install.patch
new file mode 100644 (file)
index 0000000..39d1f37
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.12-disable_versioned_easy_install.patch
@@ -0,0 +1,11 @@
+--- setup.py
++++ setup.py
+@@ -150,8 +150,6 @@
+ 
+         "console_scripts": [
+              "easy_install = setuptools.command.easy_install:main",
+-             "easy_install-%s = setuptools.command.easy_install:main"
+-                % sys.version[:3]
+         ],
+ 
+         "setuptools.file_finders":

diff --git a/dev-python/setuptools/files/distribute-0.6.12-fix_deprecation_warnings.patch b/dev-python/setuptools/files/distribute-0.6.12-fix_deprecation_warnings.patch
new file mode 100644 (file)
index 0000000..100baf9
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.12-fix_deprecation_warnings.patch
@@ -0,0 +1,122 @@
+--- pkg_resources.py
++++ pkg_resources.py
+@@ -209,9 +209,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,8 +15,21 @@
+ 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 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
+@@ -1344,8 +1357,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 sys.version >= "2.6":

diff --git a/dev-python/setuptools/setuptools-0.6.12.ebuild b/dev-python/setuptools/setuptools-0.6.12.ebuild
new file mode 100644 (file)
index 0000000..6aa8394
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.12.ebuild,v 1.1 2010/05/06 22:18:13 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="http://pypi.python.org/packages/source/${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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="easy_install.py pkg_resources.py setuptools site.py"
+DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt"
+
+src_prepare() {
+       distutils_src_prepare
+
+       epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
+
+       # Remove tests that access the network (bugs #198312, #191117)
+       rm setuptools/tests/test_packageindex.py
+
+       epatch "${FILESDIR}/distribute-${PV}-disable_versioned_easy_install.patch"
+       epatch "${FILESDIR}/distribute-${PV}-fix_deprecation_warnings.patch"
+}
+
+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 build-* -name "*.pyc" -print0 | xargs -0 rm -f
+       find build-* -name "__pycache__" -print0 | xargs -0 rmdir
+}
+
+src_install() {
+       DONT_PATCH_SETUPTOOLS="1" distutils_src_install
+}