Semi auto-sync

(manually editted for 0m 19s) -- dev-python/setuptools (2009-11-22 11:00:21.471587753 +0100)
(Portage version: 2.2.00.14813-prefix/svn/SunOS i386)

8 files changed, 80 insertions, 12 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 4cdb1a8a4a..1bdc85d548 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.86 2009/11/12 15:54:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.89 2009/11/18 17:05:19 armin76 Exp $
+
+  18 Nov 2009; Raúl Porcel <armin76@gentoo.org> setuptools-0.6.6.ebuild:
+  ia64/s390/sh/sparc stable wrt #291915
+
+  16 Nov 2009; Markus Meier <maekke@gentoo.org> setuptools-0.6.6.ebuild:
+  amd64/arm/x86 stable, bug #291915
+
+  15 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  setuptools-0.6.8.ebuild, +files/distribute-0.6.8-fix_tests.patch:
+  Fix tests with Python 3.1.
 
   12 Nov 2009; Jeroen Roovers <jer@gentoo.org> setuptools-0.6.3-r3.ebuild,
   setuptools-0.6.4.ebuild, setuptools-0.6.6.ebuild:
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9180b57b2f..11d851221c 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,16 +3,17 @@ AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8
 AUX distribute-0.6.1-USER_SITE.patch 762 RMD160 6015dc2c912fdad94e9dc9a03fb88a3af349b845 SHA1 9ac0b8a67de4c12fe2f699b320c0a860da1d4eb6 SHA256 a584f6df0a6324d41af2d56fed7a51f3a702d16f6af2abbfd42ebf33a8ee1629
 AUX distribute-0.6.1-provide_setuptools.patch 596 RMD160 a3fbfd8a655bafd319f8a5fa8d665fa7f47e6c4a SHA1 73a2077530385cbf94685971e55a926dcd183b7c SHA256 21bb562987700c4d2d4eb63b17588e10a154bb404744dadb59ea95c5e503cc55
 AUX distribute-0.6.8-C_locale_tests.patch 387 RMD160 dfee9d9762202d2eb8e87251e0ff4c4ebb093199 SHA1 89873af0e3f450415d38aa4585a30d329a451988 SHA256 9bea15ccacce210eebfc6e6253ef6f25987531e537aa7b5d8e553dc31c1487e0
+AUX distribute-0.6.8-fix_tests.patch 1786 RMD160 f8028e7566b9a2327d6f2052a9c72b3e24b3c25d SHA1 31da15b7fffb8240fc13a1b9c190208c6219c6cb SHA256 e5d771755a457124b24f205648a9caeea248fa92e6ff736efa75bbb36fe3a33c
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.3.tar.gz 412848 RMD160 100b4b9a54589608ae2c5f71f9172088a99b8223 SHA1 f259822547f09726d7c96258a6b3bb6ae9bcb75a SHA256 cc560ae693fe9acb5a525ebe2b5ec0dcf0b05808e999d464dc9bca30d175a466
 DIST distribute-0.6.6.tar.gz 527816 RMD160 d225ade6b99de9fc2ca5e353315c9db14b11cad8 SHA1 922e41fd85bc066957fd35a5120648e93a57d1e9 SHA256 94362439ad8aa81048f586d4d7350dfdc710f9ab82244219d34d9208bf7fb7a4
 DIST distribute-0.6.8.tar.gz 390582 RMD160 9115d95c07e9b650c4a5227abe0fdcecd03662a7 SHA1 8e37560e68c042baacb18d78b5b5197d6d9c5610 SHA256 308efb4ff5cfe47703050ad96c6818f452b3dcd82c612be1dde260839239d87d
 DIST distribute-0.6.tar.gz 258257 RMD160 42ebd5e9e5047d5722d63cb0f7f07e351e5c6dee SHA1 c7c61ee27236980c4c734ae82e48834fb7771fdc SHA256 8f788db7e913040150387eae3333f4f82acb59858b6163c945eed127140c67f0
 DIST setuptools-0.6c9.tar.gz 252744 RMD160 bc0ee3821e76b57fd13425b16c4419dbccf95ed9 SHA1 79086433b341f0c1df45e10d586a7d3cc25089f1 SHA256 e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8
-EBUILD setuptools-0.6-r1.ebuild 1396 RMD160 37bad2433c3f8c01368b719005666524d3f90028 SHA1 1df31695a51977ede99033f645fa1696ab34b602 SHA256 56e08c1bf44b6230cee36fa835e1871ff2a042378ad9734a9f7ccaffdc450506
-EBUILD setuptools-0.6.3-r3.ebuild 1586 RMD160 cb0c30649fe1d2b41696314b14c2aaf1200f163a SHA1 46b8d5277ad52846cf509d595e4e0b3bb24e5067 SHA256 b45e79ee493dbc3bfee91bc05d99e7bcb3d3caf863ad8cdc340d2b8e9f10c2ba
-EBUILD setuptools-0.6.6.ebuild 1821 RMD160 4e5b46c730532665926e1e08c669443d8d49f03c SHA1 f205767ee2699ca57ef34a1557f42c8cc71f78bc SHA256 c88795b95aa5dfcd5fb4fd6510d4d27ddd50cb25e3b28a5b290d2d2d90f588e9
-EBUILD setuptools-0.6.8.ebuild 1846 RMD160 6e5aefd0de685ed118db932d4b6ae48be4ed0950 SHA1 8954bf0e0398ce3a656c697b8a88a65b34461fcf SHA256 6136002a41ee9611d4d032adc8a18703d6e05bba72d24eff66c8567822f3a658
-EBUILD setuptools-0.6_rc9-r1.ebuild 1176 RMD160 7179dcfd62e6eb6e6444d9ec397ca49a702be8f1 SHA1 7beca75c7389c7bc2e245b360fba6f0f387a0e35 SHA256 e50325ca2368e6ac1396998bfeafa78b37c33c0792492e93ca24098ba952c4f3
-MISC ChangeLog 13015 RMD160 7a10146ad81f3f9a6c28c64039205b9a9ac8fe03 SHA1 aaa9a6c70548f334a171fbc53f5dbe44b3145cf2 SHA256 2637ae1012949ee7bf8f96da058b089b3723bbfa144a830778a61927adb56176
+EBUILD setuptools-0.6-r1.ebuild 1465 RMD160 d6ba1ed154e6195d9c6f393fd579df183595adb2 SHA1 74e10f98d25cebd20379fea47f74e4bf9d4ef965 SHA256 88d11affb7a027330273b0cf6dfb53f7fc564655700372ea9b1c6ebe6a6a6622
+EBUILD setuptools-0.6.3-r3.ebuild 1655 RMD160 952466236501c70ed3e71d2c337bbdc04e1ae037 SHA1 02563489885bf2de1eeb516a864c278258b769a6 SHA256 4cc3a1549e849659184303bf823568f9d134378c862bc9f42edc1763f06beeb2
+EBUILD setuptools-0.6.6.ebuild 1890 RMD160 cadd67977e1705c471b6acfaeae3c49a36ee79cb SHA1 95ba177fc7ec669b0c6f98a1be438ba3bc61fc4a SHA256 5c2d5a8dfe66dd0f8220309d7a4aad3766aa9241ca9964cc897baa9f4b3faa2f
+EBUILD setuptools-0.6.8.ebuild 2014 RMD160 ea35e86d846c084353ef3160eb1763b0ae95e10c SHA1 581a19a8b537e16d419b1514038fb4b503efb1f9 SHA256 dc85369695c247080badd2af796a96c8e6e1ac0478d4f1b57ea44eed110357b9
+EBUILD setuptools-0.6_rc9-r1.ebuild 1245 RMD160 0ec2d76cd99fa49682836b2c1b99e10ec74ab175 SHA1 a9f14ce1a2a204d1da08f1e4caa092d0a1c85a93 SHA256 e05fabc1a8a957036cd069f68bcc3c3c200e248a2c56f696cfbc49c9a1d0e9cb
+MISC ChangeLog 13415 RMD160 3d0124d0ad6396bafa69f757ce0d59b1df92df5e SHA1 897a5acd98d32451649ec7d0226da0acdca9cb45 SHA256 92e1333d99f7dfdeba847c6884cd6f180cdeb7cd561060ad9ad435132d9c3ca7
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch b/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch
new file mode 100644
index 0000000000..41b1779f3b
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch
@@ -0,0 +1,49 @@
+https://bitbucket.org/tarek/distribute/issue/80/
+https://bitbucket.org/tarek/distribute/changeset/e2de9f1e9064/
+
+--- setuptools/command/__init__.py
++++ setuptools/command/__init__.py
+@@ -5,13 +5,16 @@
+     'register', 'bdist_wininst', 'upload_docs',
+ ]
+ 
++from setuptools.command.install_scripts import install_scripts
+ import sys
++
+ if sys.version>='2.5':
+     # In Python 2.5 and above, distutils includes its own upload command
+     __all__.remove('upload')
+ 
+ from distutils.command.bdist import bdist
+ 
++
+ if 'egg' not in bdist.format_commands:
+     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
+     bdist.format_commands.append('egg')
+--- setuptools/command/install_scripts.py
++++ setuptools/command/install_scripts.py
+@@ -1,6 +1,5 @@
+ from distutils.command.install_scripts import install_scripts \
+      as _install_scripts
+-from easy_install import get_script_args, sys_executable, chmod
+ from pkg_resources import Distribution, PathMetadata, ensure_directory
+ import os
+ from distutils import log
+@@ -13,6 +12,9 @@
+         self.no_ep = False
+ 
+     def run(self):
++        from setuptools.command.easy_install import (get_script_args,
++                                                     sys_executable)
++
+         self.run_command("egg_info")
+         if self.distribution.scripts:
+             _install_scripts.run(self)  # run first to set up self.outfiles
+@@ -37,6 +39,7 @@
+ 
+     def write_script(self, script_name, contents, mode="t", *ignored):
+         """Write an executable file to the scripts directory"""
++        from setuptools.command.easy_install import chmod
+         log.info("Installing %s script to %s", script_name, self.install_dir)
+         target = os.path.join(self.install_dir, script_name)
+         self.outfiles.append(target)
diff --git a/dev-python/setuptools/setuptools-0.6-r1.ebuild b/dev-python/setuptools/setuptools-0.6-r1.ebuild
index c17bf44a80..e74b27a103 100644
--- a/dev-python/setuptools/setuptools-0.6-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6-r1.ebuild,v 1.11 2009/11/12 21:23:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6-r1.ebuild,v 1.12 2009/11/21 03:13:00 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -25,6 +25,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 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() {
diff --git a/dev-python/setuptools/setuptools-0.6.3-r3.ebuild b/dev-python/setuptools/setuptools-0.6.3-r3.ebuild
index 935aa36903..ee8ac2d483 100644
--- a/dev-python/setuptools/setuptools-0.6.3-r3.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r3.ebuild,v 1.7 2009/11/12 21:23:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r3.ebuild,v 1.8 2009/11/21 03:13:00 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -24,6 +24,7 @@ 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() {
diff --git a/dev-python/setuptools/setuptools-0.6.6.ebuild b/dev-python/setuptools/setuptools-0.6.6.ebuild
index 7e7328bae8..e765619e30 100644
--- a/dev-python/setuptools/setuptools-0.6.6.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.10 2009/11/12 21:23:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.13 2009/11/21 03:13:00 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -24,6 +24,7 @@ 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() {
diff --git a/dev-python/setuptools/setuptools-0.6.8.ebuild b/dev-python/setuptools/setuptools-0.6.8.ebuild
index bd38615f67..3433549e16 100644
--- a/dev-python/setuptools/setuptools-0.6.8.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8.ebuild,v 1.5 2009/11/12 21:23:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8.ebuild,v 1.7 2009/11/21 03:13:00 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -24,6 +24,7 @@ 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() {
@@ -38,6 +39,9 @@ src_prepare() {
 
 	# https://bitbucket.org/tarek/distribute/issue/87/
 	sed -e 's:if copied and outf.endswith(".py"):& and outf != "build/src/distribute_setup.py":' -i setup.py || die "sed setup.py failed"
+
+	# https://bitbucket.org/tarek/distribute/issue/80/
+	epatch "${FILESDIR}/${MY_P}-fix_tests.patch"
 }
 
 src_test() {
diff --git a/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild b/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild
index 6b11f844b3..b7ed2897be 100644
--- a/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild,v 1.2 2009/11/12 21:23:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc9-r1.ebuild,v 1.3 2009/11/21 03:13:00 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -24,6 +24,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
+PYTHON_MODNAME="easy_install.py pkg_resources.py setuptools site.py"
 DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
 
 src_prepare() {