Don't use no longer needed patch.

(Portage version: 14458-svn/cvs/Linux x86_64)

7 files changed, 15 insertions, 182 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index e66a211967b2..8f607d4c4bc4 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.64 2009/09/27 19:20:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.65 2009/09/28 21:26:09 arfrever Exp $
+
+*setuptools-0.6.3-r1 (28 Sep 2009)
+
+  28 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -setuptools-0.6.1-r1.ebuild, -files/distribute-0.6.1-USER_SITE.patch,
+  -files/distribute-0.6.1-provide_setuptools.patch,
+  -setuptools-0.6.2.ebuild,
+  -files/distribute-0.6.2-provide_setuptools.patch,
+  -setuptools-0.6.3.ebuild, +setuptools-0.6.3-r1.ebuild:
+  Don't use no longer needed patch.
 
 *setuptools-0.6.3 (27 Sep 2009)
 
diff --git a/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch b/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch
deleted file mode 100644
index 990160238aaf..000000000000
--- a/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bitbucket.org/tarek/distribute/changeset/2545492098ff/
-
---- distribute_setup.py
-+++ distribute_setup.py
-@@ -13,7 +13,11 @@ the appropriate options to ``use_setupto
- 
- This file can also be run as a script to install or upgrade setuptools.
- """
--from site import USER_SITE
-+try:
-+    from site import USER_SITE
-+except ImportError:
-+    USER_SITE = None
-+
- import sys
- import os
- import time
-@@ -199,7 +203,7 @@ def _under_prefix(location):
-                 if len(args) > index:
-                     top_dir = args[index+1]
-                     return location.startswith(top_dir)
--            elif option == '--user':
-+            elif option == '--user' and USER_SITE is not None:
-                 return location.startswith(USER_SITE)
-     return True
diff --git a/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch b/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch
deleted file mode 100644
index 19ab1e4d9506..000000000000
--- a/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -28,7 +28,7 @@
-     before_install()
- 
- dist = setup(
--    name="distribute",
-+    name="setuptools",
-     version=VERSION,
-     description="Download, build, install, upgrade, and uninstall Python "
-         "packages -- easily!",
---- 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" % (
--    urllib2.__version__, require('distribute')[0].version
-+    urllib2.__version__, require('setuptools')[0].version
- )
- 
- 
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
deleted file mode 100644
index 33e60652949d..000000000000
--- a/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.1-r1.ebuild b/dev-python/setuptools/setuptools-0.6.1-r1.ebuild
deleted file mode 100644
index 8f95d9365d35..000000000000
--- a/dev-python/setuptools/setuptools-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.1-r1.ebuild,v 1.1 2009/09/13 20:19:41 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=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-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/0.6.1/" -i distribute_setup.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
-}
diff --git a/dev-python/setuptools/setuptools-0.6.2.ebuild b/dev-python/setuptools/setuptools-0.6.3-r1.ebuild
index ebffcef55f3c..299ed6c46173 100644
--- a/dev-python/setuptools/setuptools-0.6.2.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.3-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.2.ebuild,v 1.2 2009/09/26 20:35:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.3-r1.ebuild,v 1.1 2009/09/28 21:26:09 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=""
+# Avoid silent errors during upgrade from older versions.
+DEPEND="!!<=dev-python/setuptools-0.6.3"
 RDEPEND=""
 
 S="${WORKDIR}/distribute-${PV}"
@@ -24,9 +25,7 @@ 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
+	rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-0.6c9-*egg-info
 }
 
 src_prepare() {
@@ -36,10 +35,6 @@ src_prepare() {
 
 	# Remove tests that access the network (bugs #198312, #191117)
 	rm setuptools/tests/test_packageindex.py
-
-	epatch "${FILESDIR}/distribute-${PV}-provide_setuptools.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() {
diff --git a/dev-python/setuptools/setuptools-0.6.3.ebuild b/dev-python/setuptools/setuptools-0.6.3.ebuild
deleted file mode 100644
index 9fd9274c26eb..000000000000
--- a/dev-python/setuptools/setuptools-0.6.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.ebuild,v 1.1 2009/09/27 19:20:07 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
-
-	epatch "${FILESDIR}/distribute-0.6.2-provide_setuptools.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
-}