Version bump. Dropped old versions.

(Portage version: 2.1.4.4)

3 files changed, 22 insertions, 41 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 70fdf9457fe6..7fa0a804c9de 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/setuptools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.37 2007/12/31 16:24:12 josejx Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.38 2008/02/23 09:18:10 dev-zero Exp $
+
+*setuptools-0.6_rc8 (23 Feb 2008)
+
+  23 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -setuptools-0.6_rc3.ebuild, -setuptools-0.6_rc6.ebuild,
+  +setuptools-0.6_rc8.ebuild:
+  Version bump. Dropped old versions.
 
   31 Dec 2007; Joseph Jezak <josejx@gentoo.org>
   setuptools-0.6_rc7-r1.ebuild:
diff --git a/dev-python/setuptools/setuptools-0.6_rc3.ebuild b/dev-python/setuptools/setuptools-0.6_rc3.ebuild
deleted file mode 100644
index 0b46c613bd7b..000000000000
--- a/dev-python/setuptools/setuptools-0.6_rc3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc3.ebuild,v 1.5 2007/07/11 06:19:47 mr_bones_ Exp $
-
-inherit distutils
-
-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 ~ia64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4.2"
-DEPEND="${RDEPEND}"
-
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt"
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
diff --git a/dev-python/setuptools/setuptools-0.6_rc6.ebuild b/dev-python/setuptools/setuptools-0.6_rc8.ebuild
index 844d9d1b5901..babf09cc3c8b 100644
--- a/dev-python/setuptools/setuptools-0.6_rc6.ebuild
+++ b/dev-python/setuptools/setuptools-0.6_rc8.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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_rc6.ebuild,v 1.10 2007/11/09 18:09:46 jer Exp $
+# $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 $
 
-inherit distutils
+NEED_PYTHON="2.4"
 
-MY_P=${P/_rc/c}
-S="${WORKDIR}/${MY_P}"
+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 ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.4.2"
-DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
 
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt"
+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 (bug 191117)
-	rm ${PN}/tests/test_packageindex.py
+	# Remove tests that access the network (bugs #198312, #191117)
+	rm setuptools/tests/test_packageindex.py
 }
 
 src_test() {
-	"${python}" setup.py test || die "tests failed"
+	PYTHONPATH="." "${python}" setup.py test || die "tests failed"
 }