summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-30 18:16:39 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-30 18:16:39 +0000
commitccc6e43b14e066d63f5d5c8412483fa0607168cc (patch)
treedcad665e0680cc2270082095dc192daeaff92940 /dev-python
parentMigrate to eapi 4, remove the static use flag, and fix #361327. (diff)
downloadhistorical-ccc6e43b14e066d63f5d5c8412483fa0607168cc.tar.gz
historical-ccc6e43b14e066d63f5d5c8412483fa0607168cc.tar.bz2
historical-ccc6e43b14e066d63f5d5c8412483fa0607168cc.zip
Decrease differences between ebuilds.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/setuptools/Manifest2
-rw-r--r--dev-python/setuptools/setuptools-0.6.14.ebuild9
2 files changed, 5 insertions, 6 deletions
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ad8219560c16..69c659d48810 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,7 +3,7 @@ AUX distribute-0.6.12-fix_deprecation_warnings.patch 4846 RMD160 13b93e767610c92
AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
DIST distribute-0.6.14.tar.gz 281527 RMD160 f56b449a71293df02636253e6667a971fef7469e SHA1 6bea50b97f36bf751548bb486a534204a690aa4d SHA256 16d5da8211d74eb11f2744c5945a3c7fcae9abbfebb56ea493f177a45d2e5bec
DIST distribute-0.6.15.tar.gz 289103 RMD160 6148fec3096d201ca1ca1fec895aa529e92b70fe SHA1 af088df456ea6b25c0e23647648fd317ed6e0d1b SHA256 5913f99039d78fde1a47057b07c8d3e5ef9ee55ce769b8a1ed8e01e2ff03cb50
-EBUILD setuptools-0.6.14.ebuild 1777 RMD160 53e32a59e0a0f12c8d88ddb9e1abccf82a8f8a6e SHA1 457fcc56f732cf9af5a70e7408807c1477a9dff7 SHA256 d2824405dfbf876405f6738cf95732c5b13fc9693f71ab1e0e8cacc9cd9893f0
+EBUILD setuptools-0.6.14.ebuild 1762 RMD160 df1c20e7cc5558a6eea33e619534ba70126e3c15 SHA1 3d2df01ce5be99902d7c749a3e398b4e962f2873 SHA256 849d10ed8fff63920c64174210d2f95e00c366e3134ca328dc7578cfd4e81f13
EBUILD setuptools-0.6.15.ebuild 1772 RMD160 8bf08eb962ec603473b11e3d27d8e4af998f173a SHA1 ffe6eab11a9acdfdba3ad34aad057c5e2f477523 SHA256 a681f16f70cd1cfaf6c58329116cc37fd3bfea380ab681bd22ba7925b66ecb18
MISC ChangeLog 18166 RMD160 60ddc6832c3e0ba62a44855f44528cd3472640cd SHA1 af10090778383b61a49770cda9e17c547ebd65d1 SHA256 55cf708a87d31c31ac42f4be91ddce15005e4356aea09f5b807e7ff23c52cce1
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/setuptools-0.6.14.ebuild b/dev-python/setuptools/setuptools-0.6.14.ebuild
index ace65dea67aa..0414725558db 100644
--- a/dev-python/setuptools/setuptools-0.6.14.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.14.ebuild
@@ -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 @@ 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.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() {