diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2011-08-18 15:46:27 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2011-08-18 15:46:27 +0000 |
| commit | fcb387ce8d6b23c881e6bf085df2d86ed0c0a37a (patch) | |
| tree | b08c0c73ac0c78049a9afaace08f997a0ff828b8 /dev-python | |
| parent | Remove old version (diff) | |
| download | historical-fcb387ce8d6b23c881e6bf085df2d86ed0c0a37a.tar.gz historical-fcb387ce8d6b23c881e6bf085df2d86ed0c0a37a.tar.bz2 historical-fcb387ce8d6b23c881e6bf085df2d86ed0c0a37a.zip | |
Multi-python install fix, thanks to marienz
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/nose/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/nose/Manifest | 14 | ||||
| -rw-r--r-- | dev-python/nose/nose-1.1.1.ebuild | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog index 5a1f3afbe69f..bc6ff8929889 100644 --- a/dev-python/nose/ChangeLog +++ b/dev-python/nose/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/nose # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.73 2011/08/12 08:07:34 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.74 2011/08/18 15:46:27 patrick Exp $ + + 18 Aug 2011; Patrick Lauer <patrick@gentoo.org> nose-1.1.1.ebuild: + Multi-python install fix, thanks to marienz *nose-1.1.1 (12 Aug 2011) diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest index d84a10e1484a..7c0c285ec767 100644 --- a/dev-python/nose/Manifest +++ b/dev-python/nose/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX nose-0.10.0-tests-nonetwork.patch 1127 RMD160 17d928c8f05676d653ed2ab9022d5c63e7929b8c SHA1 f79a86c8b1d42f8d6dd079e22caee4621315c44c SHA256 1eccfdde4ef59292e1bb517a28556c35ea4b899ab29b92cff4ea968219db3168 AUX nose-0.11.0-disable_intersphinx.patch 733 RMD160 a2174e9648ec0ae9d742a96d1ced7dcbcbdcd1ea SHA1 d3e95570a602046aa1bb2b3bd9367bfa6bffb48c SHA256 b5b941ab4dbe8d70706a55de9f50dbbaa4bf1db6196a4ef5cc966723c6f2a625 DIST nose-1.0.0.tar.gz 718742 RMD160 801df932cd8fa0f3c1fee1fdbaa88bb8dc3387a2 SHA1 30015cbcb201975dbb8613acb651984255458741 SHA256 ab85548599b3315a1299ab04bad499c030eceafc3a4ec75f3820172886c0a662 DIST nose-1.1.1.tar.gz 729308 RMD160 f57f396a14986df06026f32d7ee15b8e05fa9fb4 SHA1 855193525ee4c38eee0b6a5302d08c715fb77685 SHA256 83dbaf09aa25d1cc3ea5f2839b027a99156c37b40f78661d5257123a8f6e7b34 EBUILD nose-1.0.0.ebuild 2170 RMD160 3bbc632cb7d20a75ed68f403094adf57cfd58ac4 SHA1 2a110d537027ffde161f46e963e3102a89d3d2be SHA256 d5bdde138e9919a1253d19cac171db35e3cb9de0d4ad986499d49c317030cf55 -EBUILD nose-1.1.1.ebuild 2043 RMD160 f57e7ba654913357d82ed831e9793aa229a53f4c SHA1 d11e71168b2009263a50172be2817ac274ef92b1 SHA256 f6dbe65cbf27138cf4ba82675ebfdd596ec8ad8bd0147a06b1876303b2e1a97a -MISC ChangeLog 9475 RMD160 4158590e15cbf74d29778f7d33725779d4e56ae3 SHA1 c63d69f133a15f14b12dbf760c4f2a471cb53640 SHA256 4ccdb9d0908a54d4953856a4d92d814794d8b37e4ac384db20228f1ffb220fd9 +EBUILD nose-1.1.1.ebuild 2259 RMD160 9c5aa183ad2aea619f1126c6e1187b86e9e6e928 SHA1 dceccacfa914a3ce8432e139667ca7c97b422594 SHA256 6ec8f85a61342af28ad7a0c13db76bc45519349a9afc8188ac5291bedbe3d2c8 +MISC ChangeLog 9595 RMD160 e7aa57c472f1b6dbd5b2be98329d271213a7eb97 SHA1 8ec94856b7a3e6d69d5383807c8c0b66404b9641 SHA256 c3a00d55672a65284249fd3e6a2b51398e715407eb789f3571068c2233bcbee3 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREKAAYFAk5E308ACgkQxeMuLWsGW/uMNwCfdCVJEYyxIwd61yrv8q34I5Cn -abAAn0zTcqJSblYpArJGBYHXkoTwFryj -=NOVZ ------END PGP SIGNATURE----- diff --git a/dev-python/nose/nose-1.1.1.ebuild b/dev-python/nose/nose-1.1.1.ebuild index 4952f541fe94..fb6fcc3323fb 100644 --- a/dev-python/nose/nose-1.1.1.ebuild +++ b/dev-python/nose/nose-1.1.1.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/nose/nose-1.1.1.ebuild,v 1.1 2011/08/12 08:07:34 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.1.ebuild,v 1.2 2011/08/18 15:46:27 patrick Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -33,6 +33,8 @@ src_prepare() { -e "s/test_raises_bad_return/_&/g" \ -e "s/test_raises_twisted_error/_&/g" \ -i unit_tests/test_twisted.py || die "sed failed" + # 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() { @@ -61,7 +63,7 @@ src_install() { distutils_src_install --install-data "${EPREFIX}/usr/share" python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/nosetests" if use doc; then - dohtml -r -A txt doc/html/* || die "Installation of documentation failed" + dohtml -r -A txt doc/.build/html/* || die "Installation of documentation failed" fi if use examples; then insinto /usr/share/doc/${PF} |