diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2012-03-12 07:19:51 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2012-03-12 07:19:51 +0000 |
| commit | 34ed032f01e0a7edbfbac8a762de92bc80631bbe (patch) | |
| tree | ef57d48783bbcdc800268d38847cdd44e25d66c7 /dev-python | |
| parent | marked x86 per bug 403309 (diff) | |
| download | gentoo-2-34ed032f01e0a7edbfbac8a762de92bc80631bbe.tar.gz gentoo-2-34ed032f01e0a7edbfbac8a762de92bc80631bbe.tar.bz2 gentoo-2-34ed032f01e0a7edbfbac8a762de92bc80631bbe.zip | |
Fix for 405535 thanks to Ian Delaney
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/logilab-common/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/logilab-common/logilab-common-0.57.1.ebuild | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog index 4e87bfaa4193..b03a65e3fda3 100644 --- a/dev-python/logilab-common/ChangeLog +++ b/dev-python/logilab-common/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/logilab-common # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.98 2012/02/14 04:38:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.99 2012/03/12 07:19:51 patrick Exp $ + + 12 Mar 2012; Patrick Lauer <patrick@gentoo.org> logilab-common-0.57.1.ebuild: + Fix for 405535 thanks to Ian Delaney *logilab-common-0.57.1 (14 Feb 2012) diff --git a/dev-python/logilab-common/logilab-common-0.57.1.ebuild b/dev-python/logilab-common/logilab-common-0.57.1.ebuild index 7983f5799727..8e6559914da7 100644 --- a/dev-python/logilab-common/logilab-common-0.57.1.ebuild +++ b/dev-python/logilab-common/logilab-common-0.57.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.57.1.ebuild,v 1.1 2012/02/14 04:38:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.57.1.ebuild,v 1.2 2012/03/12 07:19:51 patrick Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -52,6 +52,11 @@ src_test() { src_install() { distutils_src_install + # Avoid conflict with dev-python/logilab-common. wrt Bug 405535 + rm -f "${D}"usr/$(get_libdir)/python*/site-packages/logilab/__init__.py || die + rm -f "${D}"usr/$(get_libdir)/pypy*/site-packages/logilab/__init__.py || die + rm -f "${D}"usr/$(get_libdir)/jython*/site-packages/logilab/__init__.py || die + python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/pytest" doman doc/pytest.1 || die "doman failed" |