summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/logilab-constraint')
-rw-r--r--dev-python/logilab-constraint/ChangeLog9
-rw-r--r--dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild6
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-python/logilab-constraint/ChangeLog b/dev-python/logilab-constraint/ChangeLog
index f04f13483403..42466dc0c7f4 100644
--- a/dev-python/logilab-constraint/ChangeLog
+++ b/dev-python/logilab-constraint/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/logilab-constraint
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.12 2013/09/05 18:46:10 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.13 2015/02/28 15:11:34 pacho Exp $
+
+ 28 Feb 2015; Pacho Ramos <pacho@gentoo.org>
+ logilab-constraint-0.5.0-r1.ebuild:
+ The colliding file needs to be removed after distutils-r1_python_install
+ (#532132)
05 Sep 2013; Michał Górny <mgorny@gentoo.org>
logilab-constraint-0.5.0-r1.ebuild:
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
index b6c491b6d863..ef198086845d 100644
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
+++ b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.5.0-r1.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild,v 1.3 2015/02/28 15:11:34 pacho Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -23,8 +23,8 @@ DOCS=( doc/CONTRIBUTORS )
python_install() {
# Avoid collisions with dev-python/logilab-common.
- rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
distutils-r1_python_install
+ rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
}
python_install_all() {