diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-12-14 19:53:15 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-12-14 19:53:15 +0000 |
| commit | 526babe026a973e5e671e8594b7805d15bc0706f (patch) | |
| tree | 3f19324abceb516556f2237e1302f1175f72d0e7 /dev-python | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-526babe026a973e5e671e8594b7805d15bc0706f.tar.gz gentoo-2-526babe026a973e5e671e8594b7805d15bc0706f.tar.bz2 gentoo-2-526babe026a973e5e671e8594b7805d15bc0706f.zip | |
Disable versioning of nosetests script to avoid collision with versioning performed by distutils_src_install().
(Portage version: 2.2.0_alpha8_p3/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/nose/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/nose/nose-0.11.3.ebuild | 5 | ||||
| -rw-r--r-- | dev-python/nose/nose-0.11.4.ebuild | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog index 6abcb88c3ef5..94c398064d6b 100644 --- a/dev-python/nose/ChangeLog +++ b/dev-python/nose/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/nose # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.61 2010/10/08 07:03:19 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.62 2010/12/14 19:53:15 arfrever Exp $ + + 14 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + nose-0.11.3.ebuild, nose-0.11.4.ebuild: + Disable versioning of nosetests script to avoid collision with versioning + performed by distutils_src_install(). 08 Oct 2010; Mart Raudsepp <leio@gentoo.org> nose-0.11.4.ebuild: Marked ~mips for bug #233554 diff --git a/dev-python/nose/nose-0.11.3.ebuild b/dev-python/nose/nose-0.11.3.ebuild index a3350e104af6..63a76f39015f 100644 --- a/dev-python/nose/nose-0.11.3.ebuild +++ b/dev-python/nose/nose-0.11.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.3.ebuild,v 1.6 2010/05/23 21:14:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.3.ebuild,v 1.7 2010/12/14 19:53:15 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -32,6 +32,9 @@ src_prepare() { # Disable tests and doc features that access the network epatch "${FILESDIR}/${PN}-0.10.0-tests-nonetwork.patch" epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch" + + # Disable versioning of nosetests script to avoid collision with versioning performed by distutils_src_install(). + sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" -i setup.py || die "sed failed" } src_compile() { diff --git a/dev-python/nose/nose-0.11.4.ebuild b/dev-python/nose/nose-0.11.4.ebuild index 72fccc63edd2..3df10a81476d 100644 --- a/dev-python/nose/nose-0.11.4.ebuild +++ b/dev-python/nose/nose-0.11.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.4.ebuild,v 1.8 2010/10/08 07:03:19 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.4.ebuild,v 1.9 2010/12/14 19:53:15 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -32,6 +32,9 @@ src_prepare() { # Disable tests and doc features that access the network epatch "${FILESDIR}/${PN}-0.10.0-tests-nonetwork.patch" epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch" + + # Disable versioning of nosetests script to avoid collision with versioning performed by distutils_src_install(). + sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" -i setup.py || die "sed failed" } src_compile() { |