Version bump.

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

4 files changed, 86 insertions, 2 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 185ab4232d66..6e56f67e6163 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.61 2009/09/26 13:39:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.62 2009/09/26 20:33:29 arfrever Exp $
+
+*setuptools-0.6.2 (26 Sep 2009)
+
+  26 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +setuptools-0.6.2.ebuild,
+  +files/distribute-0.6.2-provide_setuptools.patch:
+  Version bump.
 
   26 Sep 2009; Brent Baude <ranger@gentoo.org> setuptools-0.6-r1.ebuild:
   Marking setuptools-0.6-r1 ppc64 for bug 284972
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e9866f29888d..3bcfbeb5fbc7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,13 +2,16 @@ AUX distribute-0.6-provide_setuptools.patch 1738 RMD160 aac0fd198e7607d8c5ec2c4e
 AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
 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.2-provide_setuptools.patch 592 RMD160 e8ee45d7591c89fe8908a07e2b9e6594e6e10118 SHA1 74e3c8cc3d8e919266379d1d34be636bd9f83e36 SHA256 2e5fd9652bbeb22fae3844e1842d49bc072f151f03888f51c0a4685ffa98f9a5
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.1.tar.gz 253912 RMD160 010b6113cadc72d49bf83c1b7bc024c6ba708f4b SHA1 a17ca69ff8d08c53b0be2fb8105e1d18411fd72e SHA256 118af29b318a85fdb975f0c8fe885ad4736d3b0053599c0ed0e5531c304a73c3
+DIST distribute-0.6.2.tar.gz 415229 RMD160 b346286133b4b6f721804e567928abcc9e5d463f SHA1 998419a91b674b9de4d211ed40b479fedf5d4d41 SHA256 40f8df2aab062f0df1261fc25fedc34a13c158b5973a6db926397e05a7f4d8db
 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 1347 RMD160 b49e7bbc4e03461108a07e081255f5aafec75bba SHA1 4fafc4219b2abdfcf3f2b65d551c9e377ef5201b SHA256 26cde1df03058181e861cdbfefd7e6c444387aea3108d20c0d19ddc50eb28753
 EBUILD setuptools-0.6.1-r1.ebuild 1662 RMD160 22b100c87f83b881d399ffdfdb6d672add7e9c47 SHA1 93a015a7991144af852c221f7cf6f0ce504a247e SHA256 cc7753a257adca38232b513253dfe5b99345693ebe03c8c5a92b8f8c26f3da78
+EBUILD setuptools-0.6.2.ebuild 1662 RMD160 b4445382ec575d0dea10bd6d5dcef01a853f28e5 SHA1 943350fb2af73f7856f66a35bea5ffd224394c66 SHA256 aae2e03ab53e8eb6e0a3c5a4b5b464eec146456039fd5c7f62632210ef306007
 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 8852 RMD160 a78a4b74d42aa496d00e4ef8c91fb1e58c022e55 SHA1 89a44fc7787243f2f60dc6979f98fc311bf0818b SHA256 5ff3c641e8aaca3bd814246b4abc34e3f8d2c9e294c9c4b3374033e286c5967b
+MISC ChangeLog 9057 RMD160 6c216b256875ac69536feb7201ce8eeb1eaf382a SHA1 3c738fac7d6588bdefbae367f08b23cdfcfb14cd SHA256 a3070f3de00f38574754091077a7a46f6d6e02e57040a968e524298f04d49688
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch b/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch
new file mode 100644
index 000000000000..33e60652949d
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch
@@ -0,0 +1,22 @@
+--- setup.py
++++ setup.py
+@@ -57,7 +57,7 @@
+     before_install()
+ 
+ dist = setup(
+-    name="distribute",
++    name="setuptools",
+     version=VERSION,
+     description="Easily download, build, install, upgrade, and uninstall "
+                 "Python packages",
+--- setuptools/package_index.py
++++ setuptools/package_index.py
+@@ -143,7 +143,7 @@
+                 yield urlparse.urljoin(url, htmldecode(match.group(1)))
+ 
+ user_agent = "Python-urllib/%s distribute/%s" % (
+-    sys.version[:3], require('distribute')[0].version
++    sys.version[:3], require('setuptools')[0].version
+ )
+ 
+ 
diff --git a/dev-python/setuptools/setuptools-0.6.2.ebuild b/dev-python/setuptools/setuptools-0.6.2.ebuild
new file mode 100644
index 000000000000..a8e788e59fc5
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6.2.ebuild
@@ -0,0 +1,52 @@
+# 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.2.ebuild,v 1.1 2009/09/26 20:33:29 arfrever Exp $
+
+EAPI="2"
+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=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/distribute-${PV}"
+
+DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt"
+
+pkg_setup() {
+	if has_version "=${CATEGORY}/${PN}-0.6.1"; then
+		rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-0.6c9-*egg-info
+	fi
+}
+
+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}-provide_setuptools.patch"
+	###epatch "${FILESDIR}/distribute-${PV}-USER_SITE.patch"
+
+	sed -e "s/0\.6c9/${PV}/" -i distribute_setup.py distribute_setup_dev.py docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} || die "Fixing of versions failed"
+}
+
+src_test() {
+	tests() {
+		PYTHONPATH="." "$(PYTHON)" setup.py test
+	}
+	python_execute_function tests
+}