Version bump.

Package-Manager: portage-13958-svn/cvs/Linux x86_64

8 files changed, 149 insertions, 139 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 3d9d1e68e8df..3a8829085803 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,15 @@
 # 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.53 2009/08/01 22:56:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.54 2009/08/09 21:51:41 arfrever Exp $
+
+*setuptools-0.6 (09 Aug 2009)
+
+  09 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -setuptools-0.6_rc7-r1.ebuild, -setuptools-0.6_rc8.ebuild,
+  -setuptools-0.6_rc8-r1.ebuild, +setuptools-0.6.ebuild,
+  +files/distribute-0.6-sandbox.patch,
+  -files/setuptools-0.6_rc8-svn-1.5.patch:
+  Version bump.
 
 *setuptools-0.6_rc9-r1 (28 Jul 2009)
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 760c6a806af9..47c0cd251277 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,12 +1,9 @@
+AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
-AUX setuptools-0.6_rc8-svn-1.5.patch 1327 RMD160 1ba64287f649182a5ab0709144987975ea721dd5 SHA1 957f2c6ea2d8822158c97ee248faa7d4a986cdff SHA256 7e2419841dcf5d541acfb6ff8136405de1dbbbd0b5d101d2f7d0c75d6203d293
-DIST setuptools-0.6c7.tar.gz 249245 RMD160 edde92ef87b1313de38ebae2a939ef9710776d9d SHA1 8baa4d11bd7380ccab5c7fbdf6f8dc12a5dacba9 SHA256 f18c30ae88025bc94e04eb8f89355742db601ea0367991a0e2b69f2bf74ec0e7
-DIST setuptools-0.6c8.tar.gz 250878 RMD160 081f49dccefae08d59f905d074ad15d348d51527 SHA1 dbc7a4955672964c1c656ae4ca736cf661409d06 SHA256 96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
+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_rc7-r1.ebuild 1003 RMD160 f092726caf92b88f045906c4021df74a89cbedeb SHA1 66e25dfe520673df4d849f4a5015038188838065 SHA256 31d02bae74efcbe428279100942860f1302ff02dc41ca9bfb8f6f3965acfcbab
-EBUILD setuptools-0.6_rc8-r1.ebuild 1083 RMD160 fdd5789d569a8d30c8e6a0177bbcbd61cb6c9368 SHA1 3ff0da47b1b65be9f586d4abef60a01ead804f0a SHA256 9e07d6ca00e9dbcf26e52977f6e8f9c8ed9e32d5c47de5554bd99ff444960dd4
-EBUILD setuptools-0.6_rc8.ebuild 1039 RMD160 b1a06a69806d139de63b261d11cedb75f351bf8b SHA1 f2574c2dd5f5c13c21b82233d13cd97fdac55f0f SHA256 8dd6cc90bf38d7e1b8831264996ab858e2448139d3cfb57ad92b30ed77d4b661
+EBUILD setuptools-0.6.ebuild 1287 RMD160 91b3ec12c6e7a79100613b4c8ace49203c970599 SHA1 0b8df9369a8d9848962c2adc0ffbcf069bb202b9 SHA256 10c9bae3547a884be5ce971743d8aa13c2d4794da879849d3291a9ba02c58a61
 EBUILD setuptools-0.6_rc9-r1.ebuild 1131 RMD160 08fc600e6701de7357fc1e86dd6fd104ac971d16 SHA1 23bb7017a713eb944861770f4a27e85c097f81e4 SHA256 b417dbe2ad1eaa56aec3361e95b86ae9f5d6255acb02037663617eb5d125c5cb
 EBUILD setuptools-0.6_rc9.ebuild 1036 RMD160 80ca83620854feb65d94fcf37f72c732a9bcd5c8 SHA1 cfb18c9488bfb2080cfdcd9151c26584377d0840 SHA256 5b8703c3e492fbffed3503a21cf252259e82bb3c17929f092f4d3a8f6beb4a65
-MISC ChangeLog 7454 RMD160 29915976cb719a7558d0a7706dc0aa3cc62113d1 SHA1 64709617bc6ec71e1818ef8b7479ad4a676b9b65 SHA256 b54edeb3ca465becc2221d6c60a96f4a599eedbdafee45a35364c5cf82ad2437
+MISC ChangeLog 7775 RMD160 118e3745b414abf24655d1e5edbe5a780ddd608d SHA1 91c09601277ec81dbeea2f04ed0dfd352966067a SHA256 6cb232a1a356efaba511fc8ae05c6e65aeff30aac68453408a79130a0e08193f
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/files/distribute-0.6-sandbox.patch b/dev-python/setuptools/files/distribute-0.6-sandbox.patch
new file mode 100644
index 000000000000..9807ffa4ecf9
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6-sandbox.patch
@@ -0,0 +1,91 @@
+--- distribute_setup.py
++++ distribute_setup.py
+@@ -174,12 +174,14 @@
+     return open(path).read() == content
+ 
+ def _rename_path(path):
++    return
+     new_name = path + '.OLD.%s' % time.time()
+     log.warn('Renaming %s into %s' % (path, new_name))
+     os.rename(path, new_name)
+     return new_name
+ 
+ def _remove_flat_installation(placeholder):
++    return
+     if not os.path.isdir(placeholder):
+         log.warn('Unkown installation at %s' % placeholder)
+         return False
+@@ -212,6 +214,7 @@
+     return True
+ 
+ def after_install(dist):
++    return
+     log.warn('After install bootstrap.')
+     placeholder = dist.get_command_obj('install').install_purelib
+     if not os.path.exists(placeholder):
+@@ -256,10 +259,12 @@
+     return True
+ 
+ def before_install():
++    return
+     log.warn('Before install bootstrap.')
+     fake_setuptools()
+ 
+ def fake_setuptools():
++    return
+     log.warn('Scanning installed packages')
+     try:
+         import pkg_resources
+@@ -324,52 +329,6 @@
+ 
+ def main(argv, version=DEFAULT_VERSION):
+     """Install or upgrade setuptools and EasyInstall"""
+-    # let's deactivate any existing setuptools installation first
+-    fake_setuptools()
+-    try:
+-        import setuptools
+-        # we need to check if the installed setuptools
+-        # is from Distribute or from setuptools
+-        if not hasattr(setuptools, '_distribute'):
+-            # now we are ready to install distribute
+-            raise ImportError
+-    except ImportError:
+-        egg = None
+-        try:
+-            egg = download_setuptools(version, delay=0)
+-            sys.path.insert(0, egg)
+-            import setuptools
+-            if not hasattr(setuptools, '_distribute'):
+-                placeholder = os.path.split(os.path.dirname(setuptools.__file__))[0]
+-                if not placeholder.endswith('.egg'):
+-                    res = _remove_flat_installation(placeholder)
+-                    if res:
+-                        _relaunch()
+-                print >> sys.stderr, (
+-                "The patch didn't work, Setuptools is still active.\n"
+-                "Possible reason: your have a system-wide setuptools installed "
+-                "and you are in a virtualenv.\n"
+-                "If you are inside a virtualenv, make sure you used the --no-site-packages option"
+-                )
+-                sys.exit(2)
+-            dist = _easy_install(argv, egg)
+-            after_install(dist)
+-            return
+-            #from setuptools.command import easy_install
+-            #try:
+-            #    return easy_install.main(list(argv)+['-v']+[egg])
+-            #except DistutilsError:
+-            #    return sys.exit(2)
+-        finally:
+-            if egg and os.path.exists(egg):
+-                os.unlink(egg)
+-    else:
+-        if setuptools.__version__ == '0.0.1':
+-            print >>sys.stderr, (
+-            "You have an obsolete version of setuptools installed.  Please\n"
+-            "remove it from your system entirely before rerunning this script."
+-            )
+-            sys.exit(2)
+ 
+     req = "distribute>="+version
+     import pkg_resources
diff --git a/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch b/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch
deleted file mode 100644
index 05aaa158d38b..000000000000
--- a/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: setuptools/command/egg_info.py
-===================================================================
---- setuptools/command/egg_info.py	(revision 61076)
-+++ setuptools/command/egg_info.py	(working copy)
-@@ -217,9 +217,9 @@
-             data = f.read()
-             f.close()
- 
--            if data.startswith('8'):
-+            if data.startswith('8') or data.startswith('9'):
-                 data = map(str.splitlines,data.split('\n\x0c\n'))
--                del data[0][0]  # get rid of the '8'
-+                del data[0][0]  # get rid of the '8' or '9'
-                 dirurl = data[0][3]
-                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
-             elif data.startswith('<?xml'):
-Index: setuptools/command/sdist.py
-===================================================================
---- setuptools/command/sdist.py	(revision 61076)
-+++ setuptools/command/sdist.py	(working copy)
-@@ -86,7 +86,7 @@
-     f = open(filename,'rU')
-     data = f.read()
-     f.close()
--    if data.startswith('8'):    # subversion 1.4
-+    if data.startswith('8') or data.startswith('9'):  # subversion 1.4 or 1.5
-         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
-             if not record or len(record)>=6 and record[5]=="delete":
-                 continue    # skip deleted
-
diff --git a/dev-python/setuptools/setuptools-0.6.ebuild b/dev-python/setuptools/setuptools-0.6.ebuild
new file mode 100644
index 000000000000..8c06344a4064
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6.ebuild
@@ -0,0 +1,44 @@
+# 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.ebuild,v 1.1 2009/08/09 21:51:41 arfrever Exp $
+
+EAPI="2"
+
+NEED_PYTHON="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
+HOMEPAGE="http://pypi.python.org/pypi/distribute"
+SRC_URI="http://pypi.python.org/packages/source/d/distribute/distribute-${PV}.tar.gz"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RESTRICT_PYTHON_ABIS="3*"
+
+S="${WORKDIR}/distribute-${PV}"
+
+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
+
+	sed -e "s/additional_tests/_&/" -i setuptools/tests/__init__.py || die "sed setuptools/tests/__init__.py failed"
+	epatch "${FILESDIR}/distribute-${PV}-sandbox.patch"
+}
+
+src_test() {
+	tests() {
+		PYTHONPATH="." "$(PYTHON)" setup.py test
+	}
+	python_execute_function tests
+}
diff --git a/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild b/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild
deleted file mode 100644
index c4ce687e0b28..000000000000
--- a/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild,v 1.9 2008/01/10 09:43:08 vapier Exp $
-
-NEED_PYTHON=2.4.2
-
-inherit distutils eutils
-
-MY_P=${P/_rc/c}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
-HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
-SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
-
-src_unpack() {
-	distutils_src_unpack
-	epatch "${FILESDIR}/${P}-noexe.patch"
-
-	# Remove tests that access the network (bugs #198312, #191117)
-	rm setuptools/tests/test_packageindex.py
-}
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
diff --git a/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild b/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild
deleted file mode 100644
index 3abd347ae440..000000000000
--- a/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild,v 1.8 2008/12/07 18:07:16 vapier Exp $
-
-NEED_PYTHON="2.4"
-
-inherit distutils eutils
-
-MY_P="${P/_rc/c}"
-
-DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
-HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
-SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.tar.gz"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
-
-src_unpack() {
-	distutils_src_unpack
-
-	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
-	epatch "${FILESDIR}/${P}-svn-1.5.patch"
-
-	# Remove tests that access the network (bugs #198312, #191117)
-	rm setuptools/tests/test_packageindex.py
-}
-
-src_test() {
-	PYTHONPATH="." "${python}" setup.py test || die "tests failed"
-}
diff --git a/dev-python/setuptools/setuptools-0.6_rc8.ebuild b/dev-python/setuptools/setuptools-0.6_rc8.ebuild
deleted file mode 100644
index babf09cc3c8b..000000000000
--- a/dev-python/setuptools/setuptools-0.6_rc8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc8.ebuild,v 1.1 2008/02/23 09:18:10 dev-zero Exp $
-
-NEED_PYTHON="2.4"
-
-inherit distutils eutils
-
-MY_P="${P/_rc/c}"
-
-DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
-HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
-SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.tar.gz"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
-
-src_unpack() {
-	distutils_src_unpack
-	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
-
-	# Remove tests that access the network (bugs #198312, #191117)
-	rm setuptools/tests/test_packageindex.py
-}
-
-src_test() {
-	PYTHONPATH="." "${python}" setup.py test || die "tests failed"
-}