summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-03-13 02:40:35 +0000
committerMike Gilbert <floppym@gentoo.org>2012-03-13 02:40:35 +0000
commit0ae90e19684316731432f306c79d0701d6979914 (patch)
tree4bfd493890dd7fd14ce37a9d85d000b4e9909a5f /dev-python
parentFix dependencies. Use python_get_sitedir(). Patch by Arfrever. (diff)
downloadgentoo-2-0ae90e19684316731432f306c79d0701d6979914.tar.gz
gentoo-2-0ae90e19684316731432f306c79d0701d6979914.tar.bz2
gentoo-2-0ae90e19684316731432f306c79d0701d6979914.zip
Revert previous commit; handled in logilab-constraint.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/logilab-common/ChangeLog5
-rw-r--r--dev-python/logilab-common/logilab-common-0.57.1.ebuild7
2 files changed, 5 insertions, 7 deletions
diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index b03a65e3fda3..7717385ce03a 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.99 2012/03/12 07:19:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.100 2012/03/13 02:40:35 floppym Exp $
+
+ 13 Mar 2012; Mike Gilbert <floppym@gentoo.org> logilab-common-0.57.1.ebuild:
+ Revert previous commit; handled in logilab-constraint.
12 Mar 2012; Patrick Lauer <patrick@gentoo.org> logilab-common-0.57.1.ebuild:
Fix for 405535 thanks to Ian Delaney
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 8e6559914da7..65324dbbcac4 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.2 2012/03/12 07:19:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.57.1.ebuild,v 1.3 2012/03/13 02:40:35 floppym Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -52,11 +52,6 @@ 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"