[gentoo-commits] gentoo-x86 commit in dev-python/setuptools: setuptools-0.6.14.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/03/30 18:16:39

  Modified:             setuptools-0.6.14.ebuild
  Log:
  Decrease differences between ebuilds.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.15                 dev-python/setuptools/setuptools-0.6.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild?r1=1.14&r2=1.15

Index: setuptools-0.6.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- setuptools-0.6.14.ebuild	30 Mar 2011 16:58:48 -0000	1.14
+++ setuptools-0.6.14.ebuild	30 Mar 2011 18:16:39 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild,v 1.14 2011/03/30 16:58:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.14.ebuild,v 1.15 2011/03/30 18:16:39 arfrever Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -32,12 +32,11 @@
 	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.12-disable_versioned_easy_install.patch"
 	epatch "${FILESDIR}/distribute-0.6.12-fix_deprecation_warnings.patch"
+
+	# Disable tests requiring network connection.
+	rm -f setuptools/tests/test_packageindex.py
 }
 
 src_test() {