summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-03-13 02:38:20 +0000
committerMike Gilbert <floppym@gentoo.org>2012-03-13 02:38:20 +0000
commitc64c653cc7264b88e9111daa434f828a4af91f1a (patch)
tree629c5411b5b8707301b86c20505c7d0f389143d3 /dev-python
parentVersion bump. Ebuild by Arfrever. (diff)
downloadgentoo-2-c64c653cc7264b88e9111daa434f828a4af91f1a.tar.gz
gentoo-2-c64c653cc7264b88e9111daa434f828a4af91f1a.tar.bz2
gentoo-2-c64c653cc7264b88e9111daa434f828a4af91f1a.zip
Fix dependencies. Use python_get_sitedir(). Patch by Arfrever.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/logilab-constraint/ChangeLog6
-rw-r--r--dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild22
2 files changed, 16 insertions, 12 deletions
diff --git a/dev-python/logilab-constraint/ChangeLog b/dev-python/logilab-constraint/ChangeLog
index e4da53acd7f5..98a89396c9d3 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.5 2012/03/12 07:20:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.6 2012/03/13 02:38:20 floppym Exp $
+
+ 13 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+ logilab-constraint-0.4.0.ebuild:
+ Fix dependencies. Use python_get_sitedir(). Patch by Arfrever.
12 Mar 2012; Patrick Lauer <patrick@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 43913eeb5732..0b69113d6f16 100644
--- a/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
+++ b/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
@@ -1,11 +1,13 @@
# 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.6 2012/03/12 07:20:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild,v 1.7 2012/03/13 02:38:20 floppym Exp $
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils multilib
+inherit distutils
MY_P="${P#logilab-}"
DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
@@ -20,19 +22,17 @@ IUSE="doc"
DEPEND=""
RDEPEND=">=dev-python/logilab-common-0.12.0"
-RESTRICT_PYTHON_ABIS="3*"
-
-PYTHON_MODNAME="logilab/constraint"
-
DOCS="doc/CONTRIBUTORS"
+PYTHON_MODNAME="logilab/constraint"
src_install() {
distutils_src_install
- # Avoid conflict with dev-python/logilab-common.
- 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
+ delete_unneeded_files() {
+ # Avoid collisions with dev-python/logilab-common.
+ rm -f "${ED}$(python_get_sitedir)/logilab/__init__.py"
+ }
+ python_execute_function -q delete_unneeded_files
if use doc; then
dohtml doc/documentation.html