From: Maxim Koltsov <maksbotan@gentoo.org>
Date: Sat, 17 Dec 2011 10:00:15 +0000 (+0000)
Subject: Fixed tests, bug 357157. Thanks to Ian Delaney
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=133e5df4c3d9dbdb7f45458e566cf65b7cf8bd5f;p=gentoo.git

Fixed tests, bug 357157. Thanks to Ian Delaney

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64
---

diff --git a/dev-python/epsilon/ChangeLog b/dev-python/epsilon/ChangeLog
index 93575da9812a..f9acb385671e 100644
--- a/dev-python/epsilon/ChangeLog
+++ b/dev-python/epsilon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/epsilon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/ChangeLog,v 1.26 2011/03/05 17:25:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/ChangeLog,v 1.27 2011/12/17 10:00:15 maksbotan Exp $
+
+*epsilon-0.6.0-r1 (17 Dec 2011)
+
+  17 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> +epsilon-0.6.0-r1.ebuild:
+  Fixed tests, bug 357157. Thanks to Ian Delaney
 
   05 Mar 2011; Raúl Porcel <armin76@gentoo.org> epsilon-0.6.0.ebuild:
   Drop ia64 keywords
diff --git a/dev-python/epsilon/Manifest b/dev-python/epsilon/Manifest
index 024732b27ab3..3e5fb3ebcd68 100644
--- a/dev-python/epsilon/Manifest
+++ b/dev-python/epsilon/Manifest
@@ -1,5 +1,6 @@
 AUX epsilon_plugincache_portagesandbox.patch 537 RMD160 31870c41ee407d8f469aa344d32bb94e7f506f74 SHA1 18da8ad8e5f06e84074ef83753c3c83166483cd5 SHA256 4a09ec36e84b6dbc9b0ad62db969722e72d3b1b28e5713389aba5bd77af286a6
 DIST Epsilon-0.6.0.tar.gz 96243 RMD160 9efb6376347563a5bca425fe9baee2cb272af3a4 SHA1 416b6f46c5dced312e87eecb306d5cc7b28dd322 SHA256 2be3a6ef877c4e17ca9dadd6b484fe31bdf16c20b949ec6a8b15677e08c512fa
+EBUILD epsilon-0.6.0-r1.ebuild 1957 RMD160 6e53e52bdb620f05aced6426c6c4633cd344e56e SHA1 6a2881a3f72da764394fee0f57dea34bb78d61a3 SHA256 c9bb1e468c339a987c43d67e0b82257cbf99bae336e1763a90adaa52baa87f17
 EBUILD epsilon-0.6.0.ebuild 1590 RMD160 fdc864a693afc9a9bfee6050850be0a12e694173 SHA1 792ca1f4703c1e92c804860e5aa93b2db939de95 SHA256 243a54dc36db4975684614df9610b43120c6fe9158cd4e7006199568d89c2cdf
-MISC ChangeLog 3709 RMD160 3d14d980b9075e979e22ab66fd41e18415628be0 SHA1 2d8e2f464b728da0186a6b62e1eb2eaade50903f SHA256 52284a5954910ca4ba15f1d4984c3e21e57144d2e81530eb9764b1c717c20ebe
+MISC ChangeLog 3872 RMD160 5ab31f90f110820f7cddd918263e14c301a3639f SHA1 714e552a1383cebb45c57e4eee4cf93e2affe827 SHA256 a419783656f8c31d0320e57295f5e093f7bc29b762ff9219ab2cd59c7d536d0e
 MISC metadata.xml 452 RMD160 eace89e7cdfc75a3261bf07eea5e8e6cda63fe02 SHA1 2e12833c4aeb68a97c542ba6133b297dd1e91b54 SHA256 a1507e7ae60984c5298189970f59c29d2712566027ebb9f430d5c21288980fef
diff --git a/dev-python/epsilon/epsilon-0.6.0-r1.ebuild b/dev-python/epsilon/epsilon-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..7457c043cf3f
--- /dev/null
+++ b/dev-python/epsilon/epsilon-0.6.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.6.0-r1.ebuild,v 1.1 2011/12/17 10:00:15 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="trial"
+DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
+
+# setup.py uses epsilon.setuphelper.autosetup(), which tries to use
+# build-${PYTHON_ABI} directories as packages.
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils twisted
+
+MY_PN="Epsilon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class."
+HOMEPAGE="http://divmod.org/trac/wiki/DivmodEpsilon http://pypi.python.org/pypi/Epsilon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/twisted-2.4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="NAME.txt NEWS.txt"
+
+src_prepare() {
+	# Rename to avoid file-collisions
+	mv bin/benchmark bin/epsilon-benchmark
+	sed -i \
+		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
+		setup.py || die "sed failed"
+	# otherwise we get sandbox violations as it wants to update
+	# the plugin cache
+	epatch "${FILESDIR}/epsilon_plugincache_portagesandbox.patch"
+
+	#These test are removed upstream
+	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
+	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
+	sed -e 's:month) 2004 9:month) 2004 14:' \
+		-i epsilon/test/test_extime.py || die
+	#These are broken too
+	rm -f epsilon/test/test_release.py epsilon/release.py || die
+
+	python_copy_sources
+}
+
+src_compile() {
+	# Skip distutils_src_compile to avoid installation of $(python_get_sitedir)/build directory.
+	:
+}
+
+src_test() {
+	# Release tests need DivmodCombinator.
+	rm -f epsilon/test/test_release.py* epsilon/release.py
+
+	distutils_src_test
+}