summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2012-03-12 07:20:30 +0000
committerPatrick Lauer <patrick@gentoo.org>2012-03-12 07:20:30 +0000
commit7033c194054e4ac70e5aab45a1f9b7179bb952ba (patch)
tree332309938061e352198c42d6ec5227a9eeaaed36 /dev-python/logilab-constraint
parentmarked x86 per bug 403309 (diff)
downloadhistorical-7033c194054e4ac70e5aab45a1f9b7179bb952ba.tar.gz
historical-7033c194054e4ac70e5aab45a1f9b7179bb952ba.tar.bz2
historical-7033c194054e4ac70e5aab45a1f9b7179bb952ba.zip
Fix for 405535 thanks to Ian Delaney
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'dev-python/logilab-constraint')
-rw-r--r--dev-python/logilab-constraint/ChangeLog6
-rw-r--r--dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-python/logilab-constraint/ChangeLog b/dev-python/logilab-constraint/ChangeLog
index 9fe6c915bc3d..e4da53acd7f5 100644
--- a/dev-python/logilab-constraint/ChangeLog
+++ b/dev-python/logilab-constraint/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/logilab-constraint
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.4 2012/02/01 02:19:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.5 2012/03/12 07:20:30 patrick Exp $
+
+ 12 Mar 2012; Patrick Lauer <patrick@gentoo.org>
+ logilab-constraint-0.4.0.ebuild:
+ Fix for 405535 thanks to Ian Delaney
01 Feb 2012; Mike Gilbert <floppym@gentoo.org>
logilab-constraint-0.4.0.ebuild:
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
index bd27fb75a208..43913eeb5732 100644
--- a/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
+++ b/dev-python/logilab-constraint/logilab-constraint-0.4.0.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-constraint/logilab-constraint-0.4.0.ebuild,v 1.5 2012/02/01 02:19:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild,v 1.6 2012/03/12 07:20:30 patrick Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -30,7 +30,9 @@ src_install() {
distutils_src_install
# Avoid conflict with dev-python/logilab-common.
- rm -f "${D}"usr/$(get_libdir)/python*/site-packages/logilab/__init__.py
+ 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
if use doc; then
dohtml doc/documentation.html